diff --git a/charts/ace-installer-certified/templates/featuresets/opscenter-security/cert-manager/cert-manager.yaml b/charts/ace-installer-certified/templates/featuresets/opscenter-security/cert-manager/cert-manager.yaml
index 8188f2bb3..23bc41a5c 100644
--- a/charts/ace-installer-certified/templates/featuresets/opscenter-security/cert-manager/cert-manager.yaml
+++ b/charts/ace-installer-certified/templates/featuresets/opscenter-security/cert-manager/cert-manager.yaml
@@ -101,7 +101,6 @@ spec:
kind: HelmRepository
name: appscode-charts-oci
namespace: {{ $.Release.Namespace }}
- valuesFrom:
{{- with $vals }}
{{- dict "values" . | toYaml | nindent 2 }}
{{- end }}
diff --git a/charts/ace-installer-certified/templates/featuresets/saas-core/service-gateway-presets.yaml b/charts/ace-installer-certified/templates/featuresets/saas-core/service-gateway-presets.yaml
index 385673bb1..8530ae513 100644
--- a/charts/ace-installer-certified/templates/featuresets/saas-core/service-gateway-presets.yaml
+++ b/charts/ace-installer-certified/templates/featuresets/saas-core/service-gateway-presets.yaml
@@ -1,7 +1,7 @@
{{- with (index .Values "helm" "releases" "service-gateway-presets") }}
{{- if .enabled }}
-{{ $defaults := dict "registryFQDN" (include "registry.ghcr" $) }}
+{{ $defaults := dict }}
{{ $vals := dig "values" dict . }}
{{ $vals = mergeOverwrite $defaults $vals }}
diff --git a/charts/ace-installer/templates/featuresets/saas-core/service-gateway-presets.yaml b/charts/ace-installer/templates/featuresets/saas-core/service-gateway-presets.yaml
index 385673bb1..8530ae513 100644
--- a/charts/ace-installer/templates/featuresets/saas-core/service-gateway-presets.yaml
+++ b/charts/ace-installer/templates/featuresets/saas-core/service-gateway-presets.yaml
@@ -1,7 +1,7 @@
{{- with (index .Values "helm" "releases" "service-gateway-presets") }}
{{- if .enabled }}
-{{ $defaults := dict "registryFQDN" (include "registry.ghcr" $) }}
+{{ $defaults := dict }}
{{ $vals := dig "values" dict . }}
{{ $vals = mergeOverwrite $defaults $vals }}
diff --git a/charts/catalog-manager/crds/gateway.catalog.appscode.com_gatewayconfigs.yaml b/charts/catalog-manager/crds/gateway.catalog.appscode.com_gatewayconfigs.yaml
index 5ee319420..6cb98e03e 100644
--- a/charts/catalog-manager/crds/gateway.catalog.appscode.com_gatewayconfigs.yaml
+++ b/charts/catalog-manager/crds/gateway.catalog.appscode.com_gatewayconfigs.yaml
@@ -329,6 +329,69 @@ spec:
- Deployment
- DaemonSet
type: string
+ replicas:
+ format: int32
+ type: integer
+ resources:
+ description: ResourceRequirements describes the compute resource
+ requirements.
+ properties:
+ claims:
+ description: |-
+ Claims lists the names of resources, defined in spec.resourceClaims,
+ that are used by this container.
+
+ This field depends on the
+ DynamicResourceAllocation feature gate.
+
+ This field is immutable. It can only be set for containers.
+ items:
+ description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+ properties:
+ name:
+ description: |-
+ Name must match the name of one entry in pod.spec.resourceClaims of
+ the Pod where this field is used. It makes that resource available
+ inside a container.
+ type: string
+ request:
+ description: |-
+ Request is the name chosen for a request in the referenced claim.
+ If empty, everything from the claim is made available, otherwise
+ only the result of this request.
+ type: string
+ required:
+ - name
+ type: object
+ type: array
+ x-kubernetes-list-map-keys:
+ - name
+ x-kubernetes-list-type: map
+ limits:
+ additionalProperties:
+ anyOf:
+ - type: integer
+ - type: string
+ pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+ x-kubernetes-int-or-string: true
+ description: |-
+ Limits describes the maximum amount of compute resources allowed.
+ More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+ type: object
+ requests:
+ additionalProperties:
+ anyOf:
+ - type: integer
+ - type: string
+ pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+ x-kubernetes-int-or-string: true
+ description: |-
+ Requests describes the minimum amount of compute resources required.
+ If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+ otherwise to an implementation-defined value. Requests cannot exceed Limits.
+ More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+ type: object
+ type: object
securityContext:
description: |-
SecurityContext holds security configuration that will be applied to a container.
diff --git a/charts/service-gateway-presets/README.md b/charts/service-gateway-presets/README.md
index 0c9cb2c60..307b30421 100644
--- a/charts/service-gateway-presets/README.md
+++ b/charts/service-gateway-presets/README.md
@@ -65,8 +65,6 @@ The following table lists the configurable parameters of the `service-gateway-pr
| infra.tls.acme.gatewayName | | backend |
| infra.tls.certificate.cert | | "" |
| infra.tls.certificate.key | | "" |
-| infra.tls.jks.keystore | | "" |
| infra.dns.provider | | "external" # external,cloudflare,route53,cloudDNS |
| infra.dns.auth | | {} |
diff --git a/charts/service-gateway-presets/crds/gateway.catalog.appscode.com_gatewayconfigs.yaml b/charts/service-gateway-presets/crds/gateway.catalog.appscode.com_gatewayconfigs.yaml
index 5ee319420..6cb98e03e 100644
--- a/charts/service-gateway-presets/crds/gateway.catalog.appscode.com_gatewayconfigs.yaml
+++ b/charts/service-gateway-presets/crds/gateway.catalog.appscode.com_gatewayconfigs.yaml
@@ -329,6 +329,69 @@ spec:
- Deployment
- DaemonSet
type: string
+ replicas:
+ format: int32
+ type: integer
+ resources:
+ description: ResourceRequirements describes the compute resource
+ requirements.
+ properties:
+ claims:
+ description: |-
+ Claims lists the names of resources, defined in spec.resourceClaims,
+ that are used by this container.
+
+ This field depends on the
+ DynamicResourceAllocation feature gate.
+
+ This field is immutable. It can only be set for containers.
+ items:
+ description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+ properties:
+ name:
+ description: |-
+ Name must match the name of one entry in pod.spec.resourceClaims of
+ the Pod where this field is used. It makes that resource available
+ inside a container.
+ type: string
+ request:
+ description: |-
+ Request is the name chosen for a request in the referenced claim.
+ If empty, everything from the claim is made available, otherwise
+ only the result of this request.
+ type: string
+ required:
+ - name
+ type: object
+ type: array
+ x-kubernetes-list-map-keys:
+ - name
+ x-kubernetes-list-type: map
+ limits:
+ additionalProperties:
+ anyOf:
+ - type: integer
+ - type: string
+ pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+ x-kubernetes-int-or-string: true
+ description: |-
+ Limits describes the maximum amount of compute resources allowed.
+ More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+ type: object
+ requests:
+ additionalProperties:
+ anyOf:
+ - type: integer
+ - type: string
+ pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+ x-kubernetes-int-or-string: true
+ description: |-
+ Requests describes the minimum amount of compute resources required.
+ If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+ otherwise to an implementation-defined value. Requests cannot exceed Limits.
+ More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+ type: object
+ type: object
securityContext:
description: |-
SecurityContext holds security configuration that will be applied to a container.
diff --git a/charts/service-gateway-presets/values.yaml b/charts/service-gateway-presets/values.yaml
index 7f76d7f82..ebb993308 100644
--- a/charts/service-gateway-presets/values.yaml
+++ b/charts/service-gateway-presets/values.yaml
@@ -37,8 +37,6 @@ infra:
cert: ""
key: ""
jks:
- keystore:
- truststore:
password: ""
dns:
provider: "external" # external,cloudflare,route53,cloudDNS
diff --git a/charts/service-gateway/README.md b/charts/service-gateway/README.md
index 2e7e27af1..a170c8e62 100644
--- a/charts/service-gateway/README.md
+++ b/charts/service-gateway/README.md
@@ -66,8 +66,6 @@ The following table lists the configurable parameters of the `service-gateway` c
| infra.tls.acme.gatewayName | | backend |
| infra.tls.certificate.cert | | "" |
| infra.tls.certificate.key | | "" |
-| infra.tls.jks.keystore | | "" |
| infra.dns.provider | | "external" # external,cloudflare,route53,cloudDNS |
| infra.dns.auth | | {} |
diff --git a/charts/service-gateway/values.yaml b/charts/service-gateway/values.yaml
index 0f6bfe574..f17ba64d3 100644
--- a/charts/service-gateway/values.yaml
+++ b/charts/service-gateway/values.yaml
@@ -40,8 +40,6 @@ infra:
cert: ""
key: ""
jks:
- keystore:
- truststore:
password: ""
dns:
provider: "external" # external,cloudflare,route53,cloudDNS
diff --git a/hack/scripts/import-crds.sh b/hack/scripts/import-crds.sh
index d1c55fcdf..65bbd4e97 100755
--- a/hack/scripts/import-crds.sh
+++ b/hack/scripts/import-crds.sh
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-APPSCODE_CLOUD_CATALOG_TAG=${APPSCODE_CLOUD_CATALOG_TAG:-v0.1.0}
+APPSCODE_CLOUD_CATALOG_TAG=${APPSCODE_CLOUD_CATALOG_TAG:-v0.1.1}
APPSCODE_CLOUD_KUBE_BIND_TAG=${APPSCODE_CLOUD_KUBE_BIND_TAG:-master}
CERT_MANAGER_CERT_MANAGER_TAG=${CERT_MANAGER_CERT_MANAGER_TAG:-v1.19.2}
ENVOYPROXY_GATEWAY_TAG=${ENVOYPROXY_GATEWAY_TAG:-v1.6.2}