From f10ef624f7cd2ebe3d5a25f9fea6ad6ec286824c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B3recki?= Date: Tue, 18 Aug 2026 23:56:19 +0200 Subject: [PATCH 1/3] Make redis the first container of its pod The redis container is now first and the exporter sidecar second, so kubectl logs/exec target redis by default. Adopted from shopsys/deployment#74; documented as deviation 17. Co-Authored-By: Claude Fable 5 --- .../templates/deployment-redis.yaml | 20 +++++++------- charts/shopsys-infra/tests/infra_test.yaml | 11 +++++--- docs/migrating-from-shopsys-deployment.md | 2 ++ .../basic-production/expected/continuous.yaml | 26 +++++++++---------- .../expected/first-deploy-with-demo-data.yaml | 26 +++++++++---------- .../expected/first-deploy.yaml | 26 +++++++++---------- .../expected/continuous.yaml | 26 +++++++++---------- .../expected/first-deploy-with-demo-data.yaml | 26 +++++++++---------- .../expected/first-deploy.yaml | 26 +++++++++---------- .../expected/continuous.yaml | 26 +++++++++---------- .../expected/first-deploy-with-demo-data.yaml | 26 +++++++++---------- .../expected/first-deploy.yaml | 26 +++++++++---------- .../escaping-env/expected/continuous.yaml | 26 +++++++++---------- .../expected/first-deploy-with-demo-data.yaml | 26 +++++++++---------- .../escaping-env/expected/first-deploy.yaml | 26 +++++++++---------- .../expected/continuous.yaml | 26 +++++++++---------- .../expected/first-deploy-with-demo-data.yaml | 26 +++++++++---------- .../expected/first-deploy.yaml | 26 +++++++++---------- 18 files changed, 215 insertions(+), 208 deletions(-) diff --git a/charts/shopsys-infra/templates/deployment-redis.yaml b/charts/shopsys-infra/templates/deployment-redis.yaml index 757bcd1..1fd7743 100644 --- a/charts/shopsys-infra/templates/deployment-redis.yaml +++ b/charts/shopsys-infra/templates/deployment-redis.yaml @@ -35,15 +35,6 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} containers: - - name: redis-exporter - image: {{ include "shopsys.image" .Values.redis.exporter.image | quote }} - imagePullPolicy: {{ .Values.redis.exporter.image.pullPolicy | default "IfNotPresent" }} - ports: - - name: exporter - containerPort: 9121 - protocol: TCP - resources: - {{- toYaml .Values.redis.exporter.resources | nindent 12 }} - name: redis image: {{ include "shopsys.image" .Values.redis.image | quote }} {{- with .Values.redis.image.pullPolicy }} @@ -100,4 +91,15 @@ spec: {{- end }} resources: {{- toYaml .Values.redis.resources | nindent 12 }} +{{- /* Exporter is intentionally the second container - redis is the default target + of kubectl logs/exec (see shopsys/deployment#74) */}} + - name: redis-exporter + image: {{ include "shopsys.image" .Values.redis.exporter.image | quote }} + imagePullPolicy: {{ .Values.redis.exporter.image.pullPolicy | default "IfNotPresent" }} + ports: + - name: exporter + containerPort: 9121 + protocol: TCP + resources: + {{- toYaml .Values.redis.exporter.resources | nindent 12 }} {{- end }} diff --git a/charts/shopsys-infra/tests/infra_test.yaml b/charts/shopsys-infra/tests/infra_test.yaml index 6c29d43..d6040e3 100644 --- a/charts/shopsys-infra/tests/infra_test.yaml +++ b/charts/shopsys-infra/tests/infra_test.yaml @@ -7,17 +7,20 @@ templates: - templates/ingress-rabbitmq.yaml - templates/rbac-deploy-hooks.yaml tests: - - it: runs redis with the exporter sidecar and health probes + - it: runs redis as the first container with the exporter sidecar and health probes template: templates/deployment-redis.yaml asserts: - equal: path: spec.template.spec.containers[0].name - value: redis-exporter + value: redis - equal: - path: spec.template.spec.containers[1].image + path: spec.template.spec.containers[0].image value: "redis:7.4-alpine" + - equal: + path: spec.template.spec.containers[1].name + value: redis-exporter - matchRegex: - path: spec.template.spec.containers[1].livenessProbe.exec.command[2] + path: spec.template.spec.containers[0].livenessProbe.exec.command[2] pattern: liveness.sh - it: provisions rabbitmq with persistent storage and credentials diff --git a/docs/migrating-from-shopsys-deployment.md b/docs/migrating-from-shopsys-deployment.md index ec9e260..e3d139d 100644 --- a/docs/migrating-from-shopsys-deployment.md +++ b/docs/migrating-from-shopsys-deployment.md @@ -95,3 +95,5 @@ Intentional differences of the phase-1 rewrite; everything else is a 1:1 port. 16. **Standard Helm labels** (`app.kubernetes.io/name|instance|managed-by`, `helm.sh/chart`) are added to every resource. Purely additive — the legacy `app:` selector labels are kept untouched (selectors are immutable on existing Deployments). +17. **Redis is the first container** of its pod (exporter second) so `kubectl logs/exec` + target redis by default (adopted from shopsys/deployment#74). diff --git a/tests/golden/scenarios/basic-production/expected/continuous.yaml b/tests/golden/scenarios/basic-production/expected/continuous.yaml index af4df60..0d48a68 100644 --- a/tests/golden/scenarios/basic-production/expected/continuous.yaml +++ b/tests/golden/scenarios/basic-production/expected/continuous.yaml @@ -196,19 +196,6 @@ spec: name: redis defaultMode: 0755 containers: - - name: redis-exporter - image: "oliver006/redis_exporter:v1.89.0" - imagePullPolicy: IfNotPresent - ports: - - name: exporter - containerPort: 9121 - protocol: TCP - resources: - limits: - memory: 128Mi - requests: - cpu: 10m - memory: 128Mi - name: redis image: "redis:7.4-alpine" ports: @@ -245,6 +232,19 @@ spec: requests: cpu: 100m memory: 2500Mi + - name: redis-exporter + image: "oliver006/redis_exporter:v1.89.0" + imagePullPolicy: IfNotPresent + ports: + - name: exporter + containerPort: 9121 + protocol: TCP + resources: + limits: + memory: 128Mi + requests: + cpu: 10m + memory: 128Mi --- # Source: shopsys-infra/templates/statefulset-rabbitmq.yaml diff --git a/tests/golden/scenarios/basic-production/expected/first-deploy-with-demo-data.yaml b/tests/golden/scenarios/basic-production/expected/first-deploy-with-demo-data.yaml index 4a4e39d..f76b2e1 100644 --- a/tests/golden/scenarios/basic-production/expected/first-deploy-with-demo-data.yaml +++ b/tests/golden/scenarios/basic-production/expected/first-deploy-with-demo-data.yaml @@ -196,19 +196,6 @@ spec: name: redis defaultMode: 0755 containers: - - name: redis-exporter - image: "oliver006/redis_exporter:v1.89.0" - imagePullPolicy: IfNotPresent - ports: - - name: exporter - containerPort: 9121 - protocol: TCP - resources: - limits: - memory: 128Mi - requests: - cpu: 10m - memory: 128Mi - name: redis image: "redis:7.4-alpine" ports: @@ -245,6 +232,19 @@ spec: requests: cpu: 100m memory: 2500Mi + - name: redis-exporter + image: "oliver006/redis_exporter:v1.89.0" + imagePullPolicy: IfNotPresent + ports: + - name: exporter + containerPort: 9121 + protocol: TCP + resources: + limits: + memory: 128Mi + requests: + cpu: 10m + memory: 128Mi --- # Source: shopsys-infra/templates/statefulset-rabbitmq.yaml diff --git a/tests/golden/scenarios/basic-production/expected/first-deploy.yaml b/tests/golden/scenarios/basic-production/expected/first-deploy.yaml index e0ac940..e391fdb 100644 --- a/tests/golden/scenarios/basic-production/expected/first-deploy.yaml +++ b/tests/golden/scenarios/basic-production/expected/first-deploy.yaml @@ -196,19 +196,6 @@ spec: name: redis defaultMode: 0755 containers: - - name: redis-exporter - image: "oliver006/redis_exporter:v1.89.0" - imagePullPolicy: IfNotPresent - ports: - - name: exporter - containerPort: 9121 - protocol: TCP - resources: - limits: - memory: 128Mi - requests: - cpu: 10m - memory: 128Mi - name: redis image: "redis:7.4-alpine" ports: @@ -245,6 +232,19 @@ spec: requests: cpu: 100m memory: 2500Mi + - name: redis-exporter + image: "oliver006/redis_exporter:v1.89.0" + imagePullPolicy: IfNotPresent + ports: + - name: exporter + containerPort: 9121 + protocol: TCP + resources: + limits: + memory: 128Mi + requests: + cpu: 10m + memory: 128Mi --- # Source: shopsys-infra/templates/statefulset-rabbitmq.yaml diff --git a/tests/golden/scenarios/development-single-domain/expected/continuous.yaml b/tests/golden/scenarios/development-single-domain/expected/continuous.yaml index 3f7c91e..9b0c5a9 100644 --- a/tests/golden/scenarios/development-single-domain/expected/continuous.yaml +++ b/tests/golden/scenarios/development-single-domain/expected/continuous.yaml @@ -196,19 +196,6 @@ spec: name: redis defaultMode: 0755 containers: - - name: redis-exporter - image: "oliver006/redis_exporter:v1.89.0" - imagePullPolicy: IfNotPresent - ports: - - name: exporter - containerPort: 9121 - protocol: TCP - resources: - limits: - memory: 128Mi - requests: - cpu: 10m - memory: 128Mi - name: redis image: "redis:7.4-alpine" ports: @@ -245,6 +232,19 @@ spec: requests: cpu: "0.01" memory: 100Mi + - name: redis-exporter + image: "oliver006/redis_exporter:v1.89.0" + imagePullPolicy: IfNotPresent + ports: + - name: exporter + containerPort: 9121 + protocol: TCP + resources: + limits: + memory: 128Mi + requests: + cpu: 10m + memory: 128Mi --- # Source: shopsys-infra/templates/statefulset-rabbitmq.yaml diff --git a/tests/golden/scenarios/development-single-domain/expected/first-deploy-with-demo-data.yaml b/tests/golden/scenarios/development-single-domain/expected/first-deploy-with-demo-data.yaml index d4d0bf6..5ee457f 100644 --- a/tests/golden/scenarios/development-single-domain/expected/first-deploy-with-demo-data.yaml +++ b/tests/golden/scenarios/development-single-domain/expected/first-deploy-with-demo-data.yaml @@ -196,19 +196,6 @@ spec: name: redis defaultMode: 0755 containers: - - name: redis-exporter - image: "oliver006/redis_exporter:v1.89.0" - imagePullPolicy: IfNotPresent - ports: - - name: exporter - containerPort: 9121 - protocol: TCP - resources: - limits: - memory: 128Mi - requests: - cpu: 10m - memory: 128Mi - name: redis image: "redis:7.4-alpine" ports: @@ -245,6 +232,19 @@ spec: requests: cpu: "0.01" memory: 100Mi + - name: redis-exporter + image: "oliver006/redis_exporter:v1.89.0" + imagePullPolicy: IfNotPresent + ports: + - name: exporter + containerPort: 9121 + protocol: TCP + resources: + limits: + memory: 128Mi + requests: + cpu: 10m + memory: 128Mi --- # Source: shopsys-infra/templates/statefulset-rabbitmq.yaml diff --git a/tests/golden/scenarios/development-single-domain/expected/first-deploy.yaml b/tests/golden/scenarios/development-single-domain/expected/first-deploy.yaml index 30e20a4..2955675 100644 --- a/tests/golden/scenarios/development-single-domain/expected/first-deploy.yaml +++ b/tests/golden/scenarios/development-single-domain/expected/first-deploy.yaml @@ -196,19 +196,6 @@ spec: name: redis defaultMode: 0755 containers: - - name: redis-exporter - image: "oliver006/redis_exporter:v1.89.0" - imagePullPolicy: IfNotPresent - ports: - - name: exporter - containerPort: 9121 - protocol: TCP - resources: - limits: - memory: 128Mi - requests: - cpu: 10m - memory: 128Mi - name: redis image: "redis:7.4-alpine" ports: @@ -245,6 +232,19 @@ spec: requests: cpu: "0.01" memory: 100Mi + - name: redis-exporter + image: "oliver006/redis_exporter:v1.89.0" + imagePullPolicy: IfNotPresent + ports: + - name: exporter + containerPort: 9121 + protocol: TCP + resources: + limits: + memory: 128Mi + requests: + cpu: 10m + memory: 128Mi --- # Source: shopsys-infra/templates/statefulset-rabbitmq.yaml diff --git a/tests/golden/scenarios/development-with-cloudflare/expected/continuous.yaml b/tests/golden/scenarios/development-with-cloudflare/expected/continuous.yaml index 6020dcf..27d07ff 100644 --- a/tests/golden/scenarios/development-with-cloudflare/expected/continuous.yaml +++ b/tests/golden/scenarios/development-with-cloudflare/expected/continuous.yaml @@ -196,19 +196,6 @@ spec: name: redis defaultMode: 0755 containers: - - name: redis-exporter - image: "oliver006/redis_exporter:v1.89.0" - imagePullPolicy: IfNotPresent - ports: - - name: exporter - containerPort: 9121 - protocol: TCP - resources: - limits: - memory: 128Mi - requests: - cpu: 10m - memory: 128Mi - name: redis image: "redis:7.4-alpine" ports: @@ -245,6 +232,19 @@ spec: requests: cpu: "0.01" memory: 100Mi + - name: redis-exporter + image: "oliver006/redis_exporter:v1.89.0" + imagePullPolicy: IfNotPresent + ports: + - name: exporter + containerPort: 9121 + protocol: TCP + resources: + limits: + memory: 128Mi + requests: + cpu: 10m + memory: 128Mi --- # Source: shopsys-infra/templates/statefulset-rabbitmq.yaml diff --git a/tests/golden/scenarios/development-with-cloudflare/expected/first-deploy-with-demo-data.yaml b/tests/golden/scenarios/development-with-cloudflare/expected/first-deploy-with-demo-data.yaml index 9d14424..e2abec6 100644 --- a/tests/golden/scenarios/development-with-cloudflare/expected/first-deploy-with-demo-data.yaml +++ b/tests/golden/scenarios/development-with-cloudflare/expected/first-deploy-with-demo-data.yaml @@ -196,19 +196,6 @@ spec: name: redis defaultMode: 0755 containers: - - name: redis-exporter - image: "oliver006/redis_exporter:v1.89.0" - imagePullPolicy: IfNotPresent - ports: - - name: exporter - containerPort: 9121 - protocol: TCP - resources: - limits: - memory: 128Mi - requests: - cpu: 10m - memory: 128Mi - name: redis image: "redis:7.4-alpine" ports: @@ -245,6 +232,19 @@ spec: requests: cpu: "0.01" memory: 100Mi + - name: redis-exporter + image: "oliver006/redis_exporter:v1.89.0" + imagePullPolicy: IfNotPresent + ports: + - name: exporter + containerPort: 9121 + protocol: TCP + resources: + limits: + memory: 128Mi + requests: + cpu: 10m + memory: 128Mi --- # Source: shopsys-infra/templates/statefulset-rabbitmq.yaml diff --git a/tests/golden/scenarios/development-with-cloudflare/expected/first-deploy.yaml b/tests/golden/scenarios/development-with-cloudflare/expected/first-deploy.yaml index 8a75526..cc97745 100644 --- a/tests/golden/scenarios/development-with-cloudflare/expected/first-deploy.yaml +++ b/tests/golden/scenarios/development-with-cloudflare/expected/first-deploy.yaml @@ -196,19 +196,6 @@ spec: name: redis defaultMode: 0755 containers: - - name: redis-exporter - image: "oliver006/redis_exporter:v1.89.0" - imagePullPolicy: IfNotPresent - ports: - - name: exporter - containerPort: 9121 - protocol: TCP - resources: - limits: - memory: 128Mi - requests: - cpu: 10m - memory: 128Mi - name: redis image: "redis:7.4-alpine" ports: @@ -245,6 +232,19 @@ spec: requests: cpu: "0.01" memory: 100Mi + - name: redis-exporter + image: "oliver006/redis_exporter:v1.89.0" + imagePullPolicy: IfNotPresent + ports: + - name: exporter + containerPort: 9121 + protocol: TCP + resources: + limits: + memory: 128Mi + requests: + cpu: 10m + memory: 128Mi --- # Source: shopsys-infra/templates/statefulset-rabbitmq.yaml diff --git a/tests/golden/scenarios/escaping-env/expected/continuous.yaml b/tests/golden/scenarios/escaping-env/expected/continuous.yaml index 401ac2c..457bc6f 100644 --- a/tests/golden/scenarios/escaping-env/expected/continuous.yaml +++ b/tests/golden/scenarios/escaping-env/expected/continuous.yaml @@ -196,19 +196,6 @@ spec: name: redis defaultMode: 0755 containers: - - name: redis-exporter - image: "oliver006/redis_exporter:v1.89.0" - imagePullPolicy: IfNotPresent - ports: - - name: exporter - containerPort: 9121 - protocol: TCP - resources: - limits: - memory: 128Mi - requests: - cpu: 10m - memory: 128Mi - name: redis image: "redis:7.4-alpine" ports: @@ -245,6 +232,19 @@ spec: requests: cpu: 100m memory: 2500Mi + - name: redis-exporter + image: "oliver006/redis_exporter:v1.89.0" + imagePullPolicy: IfNotPresent + ports: + - name: exporter + containerPort: 9121 + protocol: TCP + resources: + limits: + memory: 128Mi + requests: + cpu: 10m + memory: 128Mi --- # Source: shopsys-infra/templates/statefulset-rabbitmq.yaml diff --git a/tests/golden/scenarios/escaping-env/expected/first-deploy-with-demo-data.yaml b/tests/golden/scenarios/escaping-env/expected/first-deploy-with-demo-data.yaml index 9aee9bf..44716ee 100644 --- a/tests/golden/scenarios/escaping-env/expected/first-deploy-with-demo-data.yaml +++ b/tests/golden/scenarios/escaping-env/expected/first-deploy-with-demo-data.yaml @@ -196,19 +196,6 @@ spec: name: redis defaultMode: 0755 containers: - - name: redis-exporter - image: "oliver006/redis_exporter:v1.89.0" - imagePullPolicy: IfNotPresent - ports: - - name: exporter - containerPort: 9121 - protocol: TCP - resources: - limits: - memory: 128Mi - requests: - cpu: 10m - memory: 128Mi - name: redis image: "redis:7.4-alpine" ports: @@ -245,6 +232,19 @@ spec: requests: cpu: 100m memory: 2500Mi + - name: redis-exporter + image: "oliver006/redis_exporter:v1.89.0" + imagePullPolicy: IfNotPresent + ports: + - name: exporter + containerPort: 9121 + protocol: TCP + resources: + limits: + memory: 128Mi + requests: + cpu: 10m + memory: 128Mi --- # Source: shopsys-infra/templates/statefulset-rabbitmq.yaml diff --git a/tests/golden/scenarios/escaping-env/expected/first-deploy.yaml b/tests/golden/scenarios/escaping-env/expected/first-deploy.yaml index 25b7d38..8f46972 100644 --- a/tests/golden/scenarios/escaping-env/expected/first-deploy.yaml +++ b/tests/golden/scenarios/escaping-env/expected/first-deploy.yaml @@ -196,19 +196,6 @@ spec: name: redis defaultMode: 0755 containers: - - name: redis-exporter - image: "oliver006/redis_exporter:v1.89.0" - imagePullPolicy: IfNotPresent - ports: - - name: exporter - containerPort: 9121 - protocol: TCP - resources: - limits: - memory: 128Mi - requests: - cpu: 10m - memory: 128Mi - name: redis image: "redis:7.4-alpine" ports: @@ -245,6 +232,19 @@ spec: requests: cpu: 100m memory: 2500Mi + - name: redis-exporter + image: "oliver006/redis_exporter:v1.89.0" + imagePullPolicy: IfNotPresent + ports: + - name: exporter + containerPort: 9121 + protocol: TCP + resources: + limits: + memory: 128Mi + requests: + cpu: 10m + memory: 128Mi --- # Source: shopsys-infra/templates/statefulset-rabbitmq.yaml diff --git a/tests/golden/scenarios/production-with-cloudflare/expected/continuous.yaml b/tests/golden/scenarios/production-with-cloudflare/expected/continuous.yaml index 6545786..13f06c9 100644 --- a/tests/golden/scenarios/production-with-cloudflare/expected/continuous.yaml +++ b/tests/golden/scenarios/production-with-cloudflare/expected/continuous.yaml @@ -196,19 +196,6 @@ spec: name: redis defaultMode: 0755 containers: - - name: redis-exporter - image: "oliver006/redis_exporter:v1.89.0" - imagePullPolicy: IfNotPresent - ports: - - name: exporter - containerPort: 9121 - protocol: TCP - resources: - limits: - memory: 128Mi - requests: - cpu: 10m - memory: 128Mi - name: redis image: "redis:7.4-alpine" ports: @@ -245,6 +232,19 @@ spec: requests: cpu: 100m memory: 2500Mi + - name: redis-exporter + image: "oliver006/redis_exporter:v1.89.0" + imagePullPolicy: IfNotPresent + ports: + - name: exporter + containerPort: 9121 + protocol: TCP + resources: + limits: + memory: 128Mi + requests: + cpu: 10m + memory: 128Mi --- # Source: shopsys-infra/templates/statefulset-rabbitmq.yaml diff --git a/tests/golden/scenarios/production-with-cloudflare/expected/first-deploy-with-demo-data.yaml b/tests/golden/scenarios/production-with-cloudflare/expected/first-deploy-with-demo-data.yaml index 014f416..b48e2bf 100644 --- a/tests/golden/scenarios/production-with-cloudflare/expected/first-deploy-with-demo-data.yaml +++ b/tests/golden/scenarios/production-with-cloudflare/expected/first-deploy-with-demo-data.yaml @@ -196,19 +196,6 @@ spec: name: redis defaultMode: 0755 containers: - - name: redis-exporter - image: "oliver006/redis_exporter:v1.89.0" - imagePullPolicy: IfNotPresent - ports: - - name: exporter - containerPort: 9121 - protocol: TCP - resources: - limits: - memory: 128Mi - requests: - cpu: 10m - memory: 128Mi - name: redis image: "redis:7.4-alpine" ports: @@ -245,6 +232,19 @@ spec: requests: cpu: 100m memory: 2500Mi + - name: redis-exporter + image: "oliver006/redis_exporter:v1.89.0" + imagePullPolicy: IfNotPresent + ports: + - name: exporter + containerPort: 9121 + protocol: TCP + resources: + limits: + memory: 128Mi + requests: + cpu: 10m + memory: 128Mi --- # Source: shopsys-infra/templates/statefulset-rabbitmq.yaml diff --git a/tests/golden/scenarios/production-with-cloudflare/expected/first-deploy.yaml b/tests/golden/scenarios/production-with-cloudflare/expected/first-deploy.yaml index 7933a49..6d5c4fb 100644 --- a/tests/golden/scenarios/production-with-cloudflare/expected/first-deploy.yaml +++ b/tests/golden/scenarios/production-with-cloudflare/expected/first-deploy.yaml @@ -196,19 +196,6 @@ spec: name: redis defaultMode: 0755 containers: - - name: redis-exporter - image: "oliver006/redis_exporter:v1.89.0" - imagePullPolicy: IfNotPresent - ports: - - name: exporter - containerPort: 9121 - protocol: TCP - resources: - limits: - memory: 128Mi - requests: - cpu: 10m - memory: 128Mi - name: redis image: "redis:7.4-alpine" ports: @@ -245,6 +232,19 @@ spec: requests: cpu: 100m memory: 2500Mi + - name: redis-exporter + image: "oliver006/redis_exporter:v1.89.0" + imagePullPolicy: IfNotPresent + ports: + - name: exporter + containerPort: 9121 + protocol: TCP + resources: + limits: + memory: 128Mi + requests: + cpu: 10m + memory: 128Mi --- # Source: shopsys-infra/templates/statefulset-rabbitmq.yaml From 627ad432df04bcbf571dd192372a4260cb9c0506 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B3recki?= Date: Wed, 19 Aug 2026 00:20:51 +0200 Subject: [PATCH 2/3] Remove explanatory template comment Co-Authored-By: Claude Fable 5 --- charts/shopsys-infra/templates/deployment-redis.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/charts/shopsys-infra/templates/deployment-redis.yaml b/charts/shopsys-infra/templates/deployment-redis.yaml index 1fd7743..694dd71 100644 --- a/charts/shopsys-infra/templates/deployment-redis.yaml +++ b/charts/shopsys-infra/templates/deployment-redis.yaml @@ -91,8 +91,6 @@ spec: {{- end }} resources: {{- toYaml .Values.redis.resources | nindent 12 }} -{{- /* Exporter is intentionally the second container - redis is the default target - of kubectl logs/exec (see shopsys/deployment#74) */}} - name: redis-exporter image: {{ include "shopsys.image" .Values.redis.exporter.image | quote }} imagePullPolicy: {{ .Values.redis.exporter.image.pullPolicy | default "IfNotPresent" }} From a020a6dfd3aa8593f372974397ceee03836598b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B3recki?= Date: Wed, 19 Aug 2026 00:23:17 +0200 Subject: [PATCH 3/3] Fix wording of the container-order deviation note Co-Authored-By: Claude Fable 5 --- docs/migrating-from-shopsys-deployment.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/migrating-from-shopsys-deployment.md b/docs/migrating-from-shopsys-deployment.md index e3d139d..ef2292d 100644 --- a/docs/migrating-from-shopsys-deployment.md +++ b/docs/migrating-from-shopsys-deployment.md @@ -95,5 +95,5 @@ Intentional differences of the phase-1 rewrite; everything else is a 1:1 port. 16. **Standard Helm labels** (`app.kubernetes.io/name|instance|managed-by`, `helm.sh/chart`) are added to every resource. Purely additive — the legacy `app:` selector labels are kept untouched (selectors are immutable on existing Deployments). -17. **Redis is the first container** of its pod (exporter second) so `kubectl logs/exec` - target redis by default (adopted from shopsys/deployment#74). +17. **Redis is the first container** of its pod (exporter second) so `kubectl logs` and + `kubectl exec` target the `redis` container by default (adopted from shopsys/deployment#74).