diff --git a/charts/shopware-operator/Chart.yaml b/charts/shopware-operator/Chart.yaml index 71a711e..5216880 100644 --- a/charts/shopware-operator/Chart.yaml +++ b/charts/shopware-operator/Chart.yaml @@ -5,6 +5,6 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.10.0 +version: 1.11.0 # This value is equal to the used shopware operator image. -appVersion: "1.10.0" +appVersion: "1.11.0" diff --git a/charts/shopware-operator/templates/crds/Store.yml b/charts/shopware-operator/templates/crds/Store.yml index f62fcbd..e92ec78 100644 --- a/charts/shopware-operator/templates/crds/Store.yml +++ b/charts/shopware-operator/templates/crds/Store.yml @@ -7273,6 +7273,9 @@ spec: default: /setup type: string network: + default: + enabledGateway: false + enabledIngress: false properties: annotations: additionalProperties: @@ -7325,6 +7328,18 @@ spec: default: 8000 format: int32 type: integer + preStopDelaySeconds: + default: 15 + description: |- + PreStopDelaySeconds is how long storefront and admin pods keep serving + requests after termination starts, before Caddy is stopped. Ingress + controllers and load balancers need time to remove a terminating pod from + their backends; stopping Caddy earlier causes 502s and connect timeouts + during rolling updates. Increase it for slow load balancers (e.g. cloud + LBs). Must be lower than terminationGracePeriodSeconds. + format: int64 + minimum: 1 + type: integer tlsSecretName: default: store-tls type: string diff --git a/charts/shopware-operator/templates/crds/StoreDebugInstance.yml b/charts/shopware-operator/templates/crds/StoreDebugInstance.yml index 31ef585..36a0ccc 100644 --- a/charts/shopware-operator/templates/crds/StoreDebugInstance.yml +++ b/charts/shopware-operator/templates/crds/StoreDebugInstance.yml @@ -52,8 +52,13 @@ spec: default: 1h description: |- Duration is the duration of the debug instance after which it will be deleted - e.g. 1h or 30m + e.g. 1h or 30m. Zero keeps the instance until it is deleted manually. + The pattern is enforced by the API server: a value the Go duration parser + rejects would otherwise break the informer for every StoreDebugInstance. type: string + x-kubernetes-validations: + - message: must be a valid duration, e.g. 30s, 5m or 1h + rule: self.matches('^(0|([0-9]+([.][0-9]+)?(ns|us|ms|s|m|h))+)$') extraContainerPorts: description: |- ExtraContainerPorts is the extra ports to add to the debug instance diff --git a/charts/shopware-operator/templates/crds/StoreExec.yml b/charts/shopware-operator/templates/crds/StoreExec.yml index 437195d..c7a4222 100644 --- a/charts/shopware-operator/templates/crds/StoreExec.yml +++ b/charts/shopware-operator/templates/crds/StoreExec.yml @@ -52,6 +52,24 @@ spec: type: object spec: properties: + cleanupPeriodErrorExec: + default: 1h + description: |- + How long a failed StoreExec is kept before it is deleted. + Zero disables cleanup for failed executions. + type: string + x-kubernetes-validations: + - message: must be a valid duration, e.g. 30s, 5m or 1h + rule: self.matches('^(0|([0-9]+([.][0-9]+)?(ns|us|ms|s|m|h))+)$') + cleanupPeriodSuccessfulExec: + default: 5m + description: |- + How long a successfully finished StoreExec is kept before it is deleted. + Zero disables cleanup for successful executions. + type: string + x-kubernetes-validations: + - message: must be a valid duration, e.g. 30s, 5m or 1h + rule: self.matches('^(0|([0-9]+([.][0-9]+)?(ns|us|ms|s|m|h))+)$') container: properties: affinity: diff --git a/charts/shopware-operator/templates/crds/StoreSnapshotCreate.yml b/charts/shopware-operator/templates/crds/StoreSnapshotCreate.yml index 0e763f3..69b0510 100644 --- a/charts/shopware-operator/templates/crds/StoreSnapshotCreate.yml +++ b/charts/shopware-operator/templates/crds/StoreSnapshotCreate.yml @@ -54,7 +54,7 @@ spec: properties: container: default: - image: ghcr.io/shopware/shopware-operator-snapshot:1.10.0 + image: ghcr.io/shopware/shopware-operator-snapshot:1.11.0 terminationGracePeriodSeconds: 30 description: The Image gets replaces with the tag of the crd properties: diff --git a/charts/shopware-operator/templates/crds/StoreSnapshotRestore.yml b/charts/shopware-operator/templates/crds/StoreSnapshotRestore.yml index 2031c19..8cd160e 100644 --- a/charts/shopware-operator/templates/crds/StoreSnapshotRestore.yml +++ b/charts/shopware-operator/templates/crds/StoreSnapshotRestore.yml @@ -55,7 +55,7 @@ spec: properties: container: default: - image: ghcr.io/shopware/shopware-operator-snapshot:1.10.0 + image: ghcr.io/shopware/shopware-operator-snapshot:1.11.0 terminationGracePeriodSeconds: 30 description: The Image gets replaces with the tag of the crd properties: diff --git a/charts/shopware-operator/templates/deployment.yaml b/charts/shopware-operator/templates/deployment.yaml index aa3aee1..b35ae9d 100644 --- a/charts/shopware-operator/templates/deployment.yaml +++ b/charts/shopware-operator/templates/deployment.yaml @@ -91,8 +91,6 @@ spec: value: "{{ .Values.keda.enabled | default "false" }}" - name: ENABLE_SERVICE_MONITOR value: "{{ and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }}" - - name: SUCCESSFUL_CR_CLEANUP_GRACE_PERIOD - value: "{{ .Values.successfulCRCleanupGracePeriod | default "1h" }}" {{- if .Values.metrics.enabled }} - name: METRICS_BIND_ADDRESS value: ":{{ .Values.metrics.port | default 8080 }}" diff --git a/charts/shopware-operator/values.yaml b/charts/shopware-operator/values.yaml index e6eb0db..dc7a892 100644 --- a/charts/shopware-operator/values.yaml +++ b/charts/shopware-operator/values.yaml @@ -105,8 +105,6 @@ logFormat: json # Disable check for s3/database/fastly and Opensearch checks. Useful if network access is not given for one of the services. # This is a global level. You can also control this per store. disableChecks: false -# Grace period before successful StoreExec and StoreDebugInstance CRs are deleted. Set to "0" to disable cleanup. -successfulCRCleanupGracePeriod: 1h # keda: when enabled, the operator creates a KEDA ScaledObject for every store # queue worker deployment. The ScaledObject scales the workers based on the