Skip to content

Fix svc-gw for server-side apply #1349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ArnobKumarSaha merged 1 commit into from
Sep 29, 2026
Merged

Fix svc-gw for server-side apply #1349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ...staller-certified/templates/featuresets/opscenter-security/cert-manager/cert-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ spec:
kind: HelmRepository
name: appscode-charts-oci
namespace: {{ $.Release.Namespace }}
valuesFrom:
{{- with $vals }}
{{- dict "values" . | toYaml | nindent 2 }}
{{- end }}
Expand Down
2 changes: 1 addition & 1 deletion charts/ace-installer-certified/templates/featuresets/saas-core/service-gateway-presets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/ace-installer/templates/featuresets/saas-core/service-gateway-presets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 }}
Expand Down
63 changes: 63 additions & 0 deletions charts/catalog-manager/crds/gateway.catalog.appscode.com_gatewayconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 0 additions & 2 deletions charts/service-gateway-presets/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,6 @@ The following table lists the configurable parameters of the `service-gateway-pr
| infra.tls.acme.gatewayName | | <code>backend</code> |
| infra.tls.certificate.cert | | <code>""</code> |
| infra.tls.certificate.key | | <code>""</code> |
| infra.tls.jks.keystore | | <code></code> |
| infra.tls.jks.truststore | | <code></code> |
| infra.tls.jks.password | | <code>""</code> |
| infra.dns.provider | | <code>"external" # external,cloudflare,route53,cloudDNS</code> |
| infra.dns.auth | | <code>{}</code> |
Expand Down
63 changes: 63 additions & 0 deletions charts/service-gateway-presets/crds/gateway.catalog.appscode.com_gatewayconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 0 additions & 2 deletions charts/service-gateway-presets/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ infra:
cert: ""
key: ""
jks:
keystore:
truststore:
password: ""
dns:
provider: "external" # external,cloudflare,route53,cloudDNS
Expand Down
2 changes: 0 additions & 2 deletions charts/service-gateway/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,6 @@ The following table lists the configurable parameters of the `service-gateway` c
| infra.tls.acme.gatewayName | | <code>backend</code> |
| infra.tls.certificate.cert | | <code>""</code> |
| infra.tls.certificate.key | | <code>""</code> |
| infra.tls.jks.keystore | | <code></code> |
| infra.tls.jks.truststore | | <code></code> |
| infra.tls.jks.password | | <code>""</code> |
| infra.dns.provider | | <code>"external" # external,cloudflare,route53,cloudDNS</code> |
| infra.dns.auth | | <code>{}</code> |
Expand Down
2 changes: 0 additions & 2 deletions charts/service-gateway/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ infra:
cert: ""
key: ""
jks:
keystore:
truststore:
password: ""
dns:
provider: "external" # external,cloudflare,route53,cloudDNS
Expand Down
2 changes: 1 addition & 1 deletion hack/scripts/import-crds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
Loading