deployment-service,kube-janitor,kube-node-ready: enable image-updater…

…-bot Define `$image` template variable so it is detected and updated by image-updater-bot. Similar to #8151 Signed-off-by: Alexander Yastrebov <[email protected]>
zalando-incubator · Oct 2, 2024 · 0351c08 · 0351c08
1 parent ef687f5
commit 0351c08
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/cluster/manifests/deployment-service/status-service-deployment.yaml b/cluster/manifests/deployment-service/status-service-deployment.yaml
@@ -1,5 +1,5 @@
-{{ $image   := "container-registry.zalando.net/teapot/deployment-status-service" }}
-{{ $version := "master-224" }}
+# {{ $image   := "container-registry.zalando.net/teapot/deployment-status-service:master-224" }}
+# {{ $version := index (split $image ":") 1 }}
 
 apiVersion: apps/v1
 kind: Deployment
@@ -25,12 +25,12 @@ spec:
         prometheus.io/path: /metrics
         prometheus.io/port: "9090"
         prometheus.io/scrape: "true"
-        config/hash: {{"01-config.yaml" | manifestHash}}
+        config/hash: '{{"01-config.yaml" | manifestHash}}'
     spec:
       serviceAccountName: "deployment-service-status-service"
       containers:
         - name: "deployment-service-status-service"
-          image: "{{$image}}:{{$version}}"
+          image: "{{ $image }}"
           args:
             - --readonly-principal=realm=/services,uid=stups_deployment-service
             - --readonly-principal=realm=/services,uid=k8sapi-local_deployment-service
@@ -61,7 +61,7 @@ spec:
             - name: _PLATFORM_OPENTRACING_TAG_APPLICATION
               value: deployment-service
             - name: _PLATFORM_OPENTRACING_TAG_ARTIFACT
-              value: "{{$image}}:{{$version}}"
+              value: "{{ $image }}"
             - name: _PLATFORM_OPENTRACING_TAG_ZONE
               valueFrom:
                 fieldRef:

diff --git a/cluster/manifests/kube-janitor/deployment.yaml b/cluster/manifests/kube-janitor/deployment.yaml
@@ -1,6 +1,6 @@
 # {{ if ne .Cluster.Environment "production" }}
-# {{ $internal_version := "23.7.0-main-2" }}
-# {{ $version := index (split $internal_version "-") 0 }}
+# {{ $image := "container-registry.zalando.net/teapot/kube-janitor:23.7.0-main-2" }}
+# {{ $version := index (split (index (split $image ":") 1) "-") 0 }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -34,7 +34,7 @@ spec:
       containers:
         - name: janitor
           # see https://github.com/hjacobs/kube-janitor/releases
-          image: container-registry.zalando.net/teapot/kube-janitor:{{ $internal_version }}
+          image: "{{ $image }}"
           args:
             # run every minute
             - --interval=60

diff --git a/cluster/manifests/kube-node-ready/daemonset.yaml b/cluster/manifests/kube-node-ready/daemonset.yaml
@@ -1,4 +1,5 @@
-{{ $version := "master-33" }}
+# {{ $image := "container-registry.zalando.net/teapot/kube-node-ready:master-33" }}
+# {{ $version := index (split $image ":") 1 }}
 
 apiVersion: apps/v1
 kind: DaemonSet
@@ -41,7 +42,7 @@ spec:
         effect: NoExecute
       containers:
       - name: kube-node-ready
-        image: container-registry.zalando.net/teapot/kube-node-ready:{{$version}}
+        image: "{{ $image }}"
         args:
         - --lifecycle-hook=kube-node-ready-lifecycle-hook
         resources: