From 797bf8190e35bccf02d85b64c1f7f37b48b98fbf Mon Sep 17 00:00:00 2001
From: Anirudh Ramanathan <anirudh@signadot.com>
Date: Wed, 2 Aug 2023 14:06:14 -0700
Subject: [PATCH 1/2] v0.13.2 changes

---
 signadot/operator/Chart.yaml                  |  4 +--
 .../operator/templates/agent-deployment.yaml  |  2 +-
 .../io-context-server-deployment.yaml         |  2 +-
 ...signadot.com-customresourcedefinition.yaml |  1 +
 .../templates/routeserver-deployment.yaml     |  2 +-
 ...ignadot-controller-manager-deployment.yaml | 10 +++---
 .../signadot-manager-role-clusterrole.yaml    |  1 +
 .../templates/signadot-manager-role-role.yaml |  1 +
 ...guration-mutatingwebhookconfiguration.yaml |  1 +
 ...signadot.com-customresourcedefinition.yaml |  1 +
 ...signadot.com-customresourcedefinition.yaml |  1 +
 ...signadot.com-customresourcedefinition.yaml |  1 +
 ...signadot.com-customresourcedefinition.yaml |  1 +
 ...signadot.com-customresourcedefinition.yaml |  1 +
 ...signadot.com-customresourcedefinition.yaml |  1 +
 ...signadot.com-customresourcedefinition.yaml |  1 +
 .../templates/tunnel-api-deployment.yaml      | 31 ++++++++-----------
 .../templates/tunnel-proxy-deployment.yaml    | 23 ++++++--------
 18 files changed, 44 insertions(+), 41 deletions(-)

diff --git a/signadot/operator/Chart.yaml b/signadot/operator/Chart.yaml
index b58c477..3cfd7af 100644
--- a/signadot/operator/Chart.yaml
+++ b/signadot/operator/Chart.yaml
@@ -6,10 +6,10 @@ 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: "0.13.1"
+version: "0.13.2"
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.13.1"
+appVersion: "0.13.2"
diff --git a/signadot/operator/templates/agent-deployment.yaml b/signadot/operator/templates/agent-deployment.yaml
index cde0ec2..e432707 100644
--- a/signadot/operator/templates/agent-deployment.yaml
+++ b/signadot/operator/templates/agent-deployment.yaml
@@ -48,7 +48,7 @@ spec:
             secretKeyRef:
               key: token
               name: cluster-agent
-        image: {{ with .Values }}{{ with .agent }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/agent:v0.13.1{{- end }}{{- else -}}signadot/agent:v0.13.1{{- end }}{{- else -}}signadot/agent:v0.13.1{{- end }}
+        image: {{ with .Values }}{{ with .agent }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/agent:v0.13.2{{- end }}{{- else -}}signadot/agent:v0.13.2{{- end }}{{- else -}}signadot/agent:v0.13.2{{- end }}
         imagePullPolicy: {{ with .Values }}{{ with .agent }}{{ with .imagePullPolicy }}{{ . | quote}}{{- else -}}IfNotPresent{{- end }}{{- else -}}IfNotPresent{{- end }}{{- else -}}IfNotPresent{{- end }}
         livenessProbe:
           httpGet:
diff --git a/signadot/operator/templates/io-context-server-deployment.yaml b/signadot/operator/templates/io-context-server-deployment.yaml
index 1bc5cb3..da6189a 100644
--- a/signadot/operator/templates/io-context-server-deployment.yaml
+++ b/signadot/operator/templates/io-context-server-deployment.yaml
@@ -40,7 +40,7 @@ spec:
         - /app/io-context-server
         - -tls=secretns=signadot
         - -port=8443
-        image: {{ with .Values }}{{ with .ioContextServer }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/io-context-server:v0.13.1{{- end }}{{- else -}}signadot/io-context-server:v0.13.1{{- end }}{{- else -}}signadot/io-context-server:v0.13.1{{- end }}
+        image: {{ with .Values }}{{ with .ioContextServer }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/io-context-server:v0.13.2{{- end }}{{- else -}}signadot/io-context-server:v0.13.2{{- end }}{{- else -}}signadot/io-context-server:v0.13.2{{- end }}
         imagePullPolicy: {{ with .Values }}{{ with .ioContextServer }}{{ with .imagePullPolicy }}{{ . | quote}}{{- else -}}IfNotPresent{{- end }}{{- else -}}IfNotPresent{{- end }}{{- else -}}IfNotPresent{{- end }}
         name: io-context-server
         ports:
diff --git a/signadot/operator/templates/resources.signadot.com-customresourcedefinition.yaml b/signadot/operator/templates/resources.signadot.com-customresourcedefinition.yaml
index 6c2a4f3..bf6b0b9 100644
--- a/signadot/operator/templates/resources.signadot.com-customresourcedefinition.yaml
+++ b/signadot/operator/templates/resources.signadot.com-customresourcedefinition.yaml
@@ -7,6 +7,7 @@ metadata:
     {{- range $key, $val := .Values.commonAnnotations }}
     {{ $key | quote }}: {{ $val | quote }}
     {{- end }}
+  creationTimestamp: null
   labels:
     {{- range $key, $val := .Values.commonLabels }}
     {{ $key | quote }}: {{ $val | quote }}
diff --git a/signadot/operator/templates/routeserver-deployment.yaml b/signadot/operator/templates/routeserver-deployment.yaml
index 0b63f9b..0487a79 100644
--- a/signadot/operator/templates/routeserver-deployment.yaml
+++ b/signadot/operator/templates/routeserver-deployment.yaml
@@ -36,7 +36,7 @@ spec:
         {{- end }}
     spec:
       containers:
-      - image: {{ with .Values }}{{ with .routeServer }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/route-server:v0.13.1{{- end }}{{- else -}}signadot/route-server:v0.13.1{{- end }}{{- else -}}signadot/route-server:v0.13.1{{- end }}
+      - image: {{ with .Values }}{{ with .routeServer }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/route-server:v0.13.2{{- end }}{{- else -}}signadot/route-server:v0.13.2{{- end }}{{- else -}}signadot/route-server:v0.13.2{{- end }}
         imagePullPolicy: {{ with .Values }}{{ with .routeServer }}{{ with .imagePullPolicy }}{{ . | quote}}{{- else -}}IfNotPresent{{- end }}{{- else -}}IfNotPresent{{- end }}{{- else -}}IfNotPresent{{- end }}
         name: routeserver
         ports:
diff --git a/signadot/operator/templates/signadot-controller-manager-deployment.yaml b/signadot/operator/templates/signadot-controller-manager-deployment.yaml
index 865ca80..7905293 100644
--- a/signadot/operator/templates/signadot-controller-manager-deployment.yaml
+++ b/signadot/operator/templates/signadot-controller-manager-deployment.yaml
@@ -80,14 +80,14 @@ spec:
         - name: SIDECAR_INIT_IMAGE
           value: {{ with .Values }}{{ with .routeInit }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/sd-init-networking:latest{{- end }}{{- else -}}signadot/sd-init-networking:latest{{- end }}{{- else -}}signadot/sd-init-networking:latest{{- end }}
         - name: ROUTE_SIDECAR_IMAGE
-          value: {{ with .Values }}{{ with .routeSidecar }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/route-sidecar:v0.13.1{{- end }}{{- else -}}signadot/route-sidecar:v0.13.1{{- end }}{{- else -}}signadot/route-sidecar:v0.13.1{{- end }}
+          value: {{ with .Values }}{{ with .routeSidecar }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/route-sidecar:v0.13.2{{- end }}{{- else -}}signadot/route-sidecar:v0.13.2{{- end }}{{- else -}}signadot/route-sidecar:v0.13.2{{- end }}
         - name: EXECPOD_SIDECAR_IMAGE
-          value: {{ with .Values }}{{ with .execpodSidecar }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/execpod-sidecar:v0.13.1{{- end }}{{- else -}}signadot/execpod-sidecar:v0.13.1{{- end }}{{- else -}}signadot/execpod-sidecar:v0.13.1{{- end }}
+          value: {{ with .Values }}{{ with .execpodSidecar }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/execpod-sidecar:v0.13.2{{- end }}{{- else -}}signadot/execpod-sidecar:v0.13.2{{- end }}{{- else -}}signadot/execpod-sidecar:v0.13.2{{- end }}
         - name: IO_INIT_IMAGE
-          value: {{ with .Values }}{{ with .ioInit }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/io-init:v0.13.1{{- end }}{{- else -}}signadot/io-init:v0.13.1{{- end }}{{- else -}}signadot/io-init:v0.13.1{{- end }}
+          value: {{ with .Values }}{{ with .ioInit }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/io-init:v0.13.2{{- end }}{{- else -}}signadot/io-init:v0.13.2{{- end }}{{- else -}}signadot/io-init:v0.13.2{{- end }}
         - name: IO_SIDECAR_IMAGE
-          value: {{ with .Values }}{{ with .ioSidecar }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/io-sidecar:v0.13.1{{- end }}{{- else -}}signadot/io-sidecar:v0.13.1{{- end }}{{- else -}}signadot/io-sidecar:v0.13.1{{- end }}
-        image: {{ with .Values }}{{ with .operator }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/operator:v0.13.1{{- end }}{{- else -}}signadot/operator:v0.13.1{{- end }}{{- else -}}signadot/operator:v0.13.1{{- end }}
+          value: {{ with .Values }}{{ with .ioSidecar }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/io-sidecar:v0.13.2{{- end }}{{- else -}}signadot/io-sidecar:v0.13.2{{- end }}{{- else -}}signadot/io-sidecar:v0.13.2{{- end }}
+        image: {{ with .Values }}{{ with .operator }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/operator:v0.13.2{{- end }}{{- else -}}signadot/operator:v0.13.2{{- end }}{{- else -}}signadot/operator:v0.13.2{{- end }}
         imagePullPolicy: {{ with .Values }}{{ with .operator }}{{ with .imagePullPolicy }}{{ . | quote}}{{- else -}}IfNotPresent{{- end }}{{- else -}}IfNotPresent{{- end }}{{- else -}}IfNotPresent{{- end }}
         livenessProbe:
           httpGet:
diff --git a/signadot/operator/templates/signadot-manager-role-clusterrole.yaml b/signadot/operator/templates/signadot-manager-role-clusterrole.yaml
index c0e7875..8c0f55f 100644
--- a/signadot/operator/templates/signadot-manager-role-clusterrole.yaml
+++ b/signadot/operator/templates/signadot-manager-role-clusterrole.yaml
@@ -6,6 +6,7 @@ metadata:
     {{- range $key, $val := .Values.commonAnnotations }}
     {{ $key | quote }}: {{ $val | quote }}
     {{- end }}
+  creationTimestamp: null
   labels:
     {{- range $key, $val := .Values.commonLabels }}
     {{ $key | quote }}: {{ $val | quote }}
diff --git a/signadot/operator/templates/signadot-manager-role-role.yaml b/signadot/operator/templates/signadot-manager-role-role.yaml
index f8e7b94..b88d7e0 100644
--- a/signadot/operator/templates/signadot-manager-role-role.yaml
+++ b/signadot/operator/templates/signadot-manager-role-role.yaml
@@ -6,6 +6,7 @@ metadata:
     {{- range $key, $val := .Values.commonAnnotations }}
     {{ $key | quote }}: {{ $val | quote }}
     {{- end }}
+  creationTimestamp: null
   labels:
     {{- range $key, $val := .Values.commonLabels }}
     {{ $key | quote }}: {{ $val | quote }}
diff --git a/signadot/operator/templates/signadot-mutating-webhook-configuration-mutatingwebhookconfiguration.yaml b/signadot/operator/templates/signadot-mutating-webhook-configuration-mutatingwebhookconfiguration.yaml
index 812e88f..637c164 100644
--- a/signadot/operator/templates/signadot-mutating-webhook-configuration-mutatingwebhookconfiguration.yaml
+++ b/signadot/operator/templates/signadot-mutating-webhook-configuration-mutatingwebhookconfiguration.yaml
@@ -7,6 +7,7 @@ metadata:
     {{- range $key, $val := .Values.commonAnnotations }}
     {{ $key | quote }}: {{ $val | quote }}
     {{- end }}
+  creationTimestamp: "null"
   labels:
     {{- range $key, $val := .Values.commonLabels }}
     {{ $key | quote }}: {{ $val | quote }}
diff --git a/signadot/operator/templates/signadotexternalworkloads.signadot.com-customresourcedefinition.yaml b/signadot/operator/templates/signadotexternalworkloads.signadot.com-customresourcedefinition.yaml
index aee25c9..7e2c522 100644
--- a/signadot/operator/templates/signadotexternalworkloads.signadot.com-customresourcedefinition.yaml
+++ b/signadot/operator/templates/signadotexternalworkloads.signadot.com-customresourcedefinition.yaml
@@ -7,6 +7,7 @@ metadata:
     {{- range $key, $val := .Values.commonAnnotations }}
     {{ $key | quote }}: {{ $val | quote }}
     {{- end }}
+  creationTimestamp: null
   labels:
     {{- range $key, $val := .Values.commonLabels }}
     {{ $key | quote }}: {{ $val | quote }}
diff --git a/signadot/operator/templates/signadotobjectlifecyclemethods.signadot.com-customresourcedefinition.yaml b/signadot/operator/templates/signadotobjectlifecyclemethods.signadot.com-customresourcedefinition.yaml
index a788d8a..3e2c786 100644
--- a/signadot/operator/templates/signadotobjectlifecyclemethods.signadot.com-customresourcedefinition.yaml
+++ b/signadot/operator/templates/signadotobjectlifecyclemethods.signadot.com-customresourcedefinition.yaml
@@ -7,6 +7,7 @@ metadata:
     {{- range $key, $val := .Values.commonAnnotations }}
     {{ $key | quote }}: {{ $val | quote }}
     {{- end }}
+  creationTimestamp: null
   labels:
     {{- range $key, $val := .Values.commonLabels }}
     {{ $key | quote }}: {{ $val | quote }}
diff --git a/signadot/operator/templates/signadotresourceplugins.signadot.com-customresourcedefinition.yaml b/signadot/operator/templates/signadotresourceplugins.signadot.com-customresourcedefinition.yaml
index 454ddb6..e6fda94 100644
--- a/signadot/operator/templates/signadotresourceplugins.signadot.com-customresourcedefinition.yaml
+++ b/signadot/operator/templates/signadotresourceplugins.signadot.com-customresourcedefinition.yaml
@@ -7,6 +7,7 @@ metadata:
     {{- range $key, $val := .Values.commonAnnotations }}
     {{ $key | quote }}: {{ $val | quote }}
     {{- end }}
+  creationTimestamp: null
   labels:
     {{- range $key, $val := .Values.commonLabels }}
     {{ $key | quote }}: {{ $val | quote }}
diff --git a/signadot/operator/templates/signadotresources.signadot.com-customresourcedefinition.yaml b/signadot/operator/templates/signadotresources.signadot.com-customresourcedefinition.yaml
index 70ce0b2..cad48b9 100644
--- a/signadot/operator/templates/signadotresources.signadot.com-customresourcedefinition.yaml
+++ b/signadot/operator/templates/signadotresources.signadot.com-customresourcedefinition.yaml
@@ -7,6 +7,7 @@ metadata:
     {{- range $key, $val := .Values.commonAnnotations }}
     {{ $key | quote }}: {{ $val | quote }}
     {{- end }}
+  creationTimestamp: null
   labels:
     {{- range $key, $val := .Values.commonLabels }}
     {{ $key | quote }}: {{ $val | quote }}
diff --git a/signadot/operator/templates/signadotroutegroups.signadot.com-customresourcedefinition.yaml b/signadot/operator/templates/signadotroutegroups.signadot.com-customresourcedefinition.yaml
index cb277d4..fd87907 100644
--- a/signadot/operator/templates/signadotroutegroups.signadot.com-customresourcedefinition.yaml
+++ b/signadot/operator/templates/signadotroutegroups.signadot.com-customresourcedefinition.yaml
@@ -7,6 +7,7 @@ metadata:
     {{- range $key, $val := .Values.commonAnnotations }}
     {{ $key | quote }}: {{ $val | quote }}
     {{- end }}
+  creationTimestamp: null
   labels:
     {{- range $key, $val := .Values.commonLabels }}
     {{ $key | quote }}: {{ $val | quote }}
diff --git a/signadot/operator/templates/signadotroutes.signadot.com-customresourcedefinition.yaml b/signadot/operator/templates/signadotroutes.signadot.com-customresourcedefinition.yaml
index efadc52..2f22145 100644
--- a/signadot/operator/templates/signadotroutes.signadot.com-customresourcedefinition.yaml
+++ b/signadot/operator/templates/signadotroutes.signadot.com-customresourcedefinition.yaml
@@ -7,6 +7,7 @@ metadata:
     {{- range $key, $val := .Values.commonAnnotations }}
     {{ $key | quote }}: {{ $val | quote }}
     {{- end }}
+  creationTimestamp: null
   labels:
     {{- range $key, $val := .Values.commonLabels }}
     {{ $key | quote }}: {{ $val | quote }}
diff --git a/signadot/operator/templates/signadotsandboxes.signadot.com-customresourcedefinition.yaml b/signadot/operator/templates/signadotsandboxes.signadot.com-customresourcedefinition.yaml
index 43acd2d..dbbc9e7 100644
--- a/signadot/operator/templates/signadotsandboxes.signadot.com-customresourcedefinition.yaml
+++ b/signadot/operator/templates/signadotsandboxes.signadot.com-customresourcedefinition.yaml
@@ -7,6 +7,7 @@ metadata:
     {{- range $key, $val := .Values.commonAnnotations }}
     {{ $key | quote }}: {{ $val | quote }}
     {{- end }}
+  creationTimestamp: null
   labels:
     {{- range $key, $val := .Values.commonLabels }}
     {{ $key | quote }}: {{ $val | quote }}
diff --git a/signadot/operator/templates/tunnel-api-deployment.yaml b/signadot/operator/templates/tunnel-api-deployment.yaml
index b535d26..7beed5b 100644
--- a/signadot/operator/templates/tunnel-api-deployment.yaml
+++ b/signadot/operator/templates/tunnel-api-deployment.yaml
@@ -13,16 +13,14 @@ metadata:
   name: tunnel-api
   namespace: signadot
 spec:
-{{- if and .Values .Values.tunnel .Values.tunnel.api .Values.tunnel.api.replicas }}
-  replicas: {{ .Values.tunnel.api.replicas }}
-{{- end }}
+{{ with .Values }}{{ with .tunnel }}{{ with .api }}{{ with .replicas }}  replicas: {{ . }}
+{{- else -}}{{- end }}{{- else -}}{{- end }}{{- else -}}{{- end }}{{- else -}}{{- end }}
   selector:
     matchLabels:
       app: tunnel-api
-{{- if and .Values .Values.tunnel .Values.tunnel.api .Values.tunnel.api.strategy }}
-  strategy:
-{{ toYaml .Values.tunnel.api.strategy | indent 10 }}
-{{- end }}
+{{ with .Values }}{{ with .tunnel }}{{ with .api }}{{ with .strategy }}  strategy:
+{{ toYaml . | indent 10 }}
+{{- else -}}{{- end }}{{- else -}}{{- end }}{{- else -}}{{- end }}{{- else -}}{{- end }}
   template:
     metadata:
       annotations:
@@ -43,19 +41,16 @@ spec:
     spec:
       containers:
       - args:
-{{- if and .Values .Values.tunnel .Values.tunnel.config .Values.tunnel.config.externalDNS .Values.tunnel.config.externalDNS.server }}
-        - --external-dns-server={{ .Values.tunnel.config.externalDNS.server }}
-{{- end }}
-{{- if and .Values .Values.tunnel .Values.tunnel.config .Values.tunnel.config.externalDNS .Values.tunnel.config.externalDNS.syncInterval }}
-        - --external-dns-resync-interval={{ .Values.tunnel.config.externalDNS.syncInterval }}
-{{- end }}
-        image: {{ with .Values }}{{ with .tunnel }}{{ with .api }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/tunnel-api:v0.13.1{{- end }}{{- else -}}signadot/tunnel-api:v0.13.1{{- end }}{{- else -}}signadot/tunnel-api:v0.13.1{{- end }}{{- else -}}signadot/tunnel-api:v0.13.1{{- end }}
+{{ with .Values }}{{ with .tunnel }}{{ with .config }}{{ with .externalDNS }}{{ with .server }}        - --external-dns-server={{ . }}
+{{- else -}}{{- end }}{{- else -}}{{- end }}{{- else -}}{{- end }}{{- else -}}{{- end }}{{- else -}}{{- end }}
+{{ with .Values }}{{ with .tunnel }}{{ with .config }}{{ with .externalDNS }}{{ with .syncInterval }}        - --external-dns-resync-interval={{ . }}
+{{- else -}}{{- end }}{{- else -}}{{- end }}{{- else -}}{{- end }}{{- else -}}{{- end }}{{- else -}}{{- end }}
+        image: {{ with .Values }}{{ with .tunnel }}{{ with .api }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/tunnel-api:v0.13.2{{- end }}{{- else -}}signadot/tunnel-api:v0.13.2{{- end }}{{- else -}}signadot/tunnel-api:v0.13.2{{- end }}{{- else -}}signadot/tunnel-api:v0.13.2{{- end }}
         imagePullPolicy: {{ with .Values }}{{ with .tunnel }}{{ with .api }}{{ with .imagePullPolicy }}{{ . | quote}}{{- else -}}IfNotPresent{{- end }}{{- else -}}IfNotPresent{{- end }}{{- else -}}IfNotPresent{{- end }}{{- else -}}IfNotPresent{{- end }}
         name: tunnel-api
         ports:
         - containerPort: 9070
-{{- if and .Values .Values.tunnel .Values.tunnel.api .Values.tunnel.api.resources }}
-        resources:
-{{ toYaml .Values.tunnel.api.resources | indent 10 }}
-{{- end }}
+{{ with .Values }}{{ with .tunnel }}{{ with .api }}{{ with .resources }}        resources:
+{{ toYaml . | indent 10 }}
+{{- else -}}{{- end }}{{- else -}}{{- end }}{{- else -}}{{- end }}{{- else -}}{{- end }}
       serviceAccountName: tunnel-api
diff --git a/signadot/operator/templates/tunnel-proxy-deployment.yaml b/signadot/operator/templates/tunnel-proxy-deployment.yaml
index bbf2d1b..86efef7 100644
--- a/signadot/operator/templates/tunnel-proxy-deployment.yaml
+++ b/signadot/operator/templates/tunnel-proxy-deployment.yaml
@@ -13,16 +13,14 @@ metadata:
   name: tunnel-proxy
   namespace: signadot
 spec:
-{{- if and .Values .Values.tunnel .Values.tunnel.proxy .Values.tunnel.proxy.replicas }}
-  replicas: {{ .Values.tunnel.proxy.replicas }}
-{{- end }}
+{{ with .Values }}{{ with .tunnel }}{{ with .proxy }}{{ with .replicas }}  replicas: {{ . }}
+{{- else -}}{{- end }}{{- else -}}{{- end }}{{- else -}}{{- end }}{{- else -}}{{- end }}
   selector:
     matchLabels:
       app: tunnel-proxy
-{{- if and .Values .Values.tunnel .Values.tunnel.proxy .Values.tunnel.proxy.strategy }}
-  strategy:
-{{ toYaml .Values.tunnel.proxy.strategy | indent 10 }}
-{{- end }}
+{{ with .Values }}{{ with .tunnel }}{{ with .proxy }}{{ with .strategy }}  strategy:
+{{ toYaml . | indent 10 }}
+{{- else -}}{{- end }}{{- else -}}{{- end }}{{- else -}}{{- end }}{{- else -}}{{- end }}
   template:
     metadata:
       annotations:
@@ -55,7 +53,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
-        image: {{ with .Values }}{{ with .tunnel }}{{ with .proxy }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/tunnel-proxy:v0.13.1{{- end }}{{- else -}}signadot/tunnel-proxy:v0.13.1{{- end }}{{- else -}}signadot/tunnel-proxy:v0.13.1{{- end }}{{- else -}}signadot/tunnel-proxy:v0.13.1{{- end }}
+        image: {{ with .Values }}{{ with .tunnel }}{{ with .proxy }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/tunnel-proxy:v0.13.2{{- end }}{{- else -}}signadot/tunnel-proxy:v0.13.2{{- end }}{{- else -}}signadot/tunnel-proxy:v0.13.2{{- end }}{{- else -}}signadot/tunnel-proxy:v0.13.2{{- end }}
         imagePullPolicy: {{ with .Values }}{{ with .tunnel }}{{ with .proxy }}{{ with .imagePullPolicy }}{{ . | quote}}{{- else -}}IfNotPresent{{- end }}{{- else -}}IfNotPresent{{- end }}{{- else -}}IfNotPresent{{- end }}{{- else -}}IfNotPresent{{- end }}
         name: tunnel-proxy
         ports:
@@ -64,10 +62,9 @@ spec:
         - containerPort: 2222
         - containerPort: 7777
         - containerPort: 8001
-{{- if and .Values .Values.tunnel .Values.tunnel.proxy .Values.tunnel.proxy.resources }}
-        resources:
-{{ toYaml .Values.tunnel.proxy.resources | indent 10 }}
-{{- end }}
+{{ with .Values }}{{ with .tunnel }}{{ with .proxy }}{{ with .resources }}        resources:
+{{ toYaml . | indent 10 }}
+{{- else -}}{{- end }}{{- else -}}{{- end }}{{- else -}}{{- end }}{{- else -}}{{- end }}
       - args:
         - -c
         - /etc/config.yaml
@@ -100,7 +97,7 @@ spec:
           value: "10000"
         - name: OUTBOUND_AUDITOR_PORT
           value: "10001"
-        image: {{ with .Values }}{{ with .tunnel }}{{ with .auditor }}{{ with .init }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/tunnel-auditor-init:v0.13.1{{- end }}{{- else -}}signadot/tunnel-auditor-init:v0.13.1{{- end }}{{- else -}}signadot/tunnel-auditor-init:v0.13.1{{- end }}{{- else -}}signadot/tunnel-auditor-init:v0.13.1{{- end }}{{- else -}}signadot/tunnel-auditor-init:v0.13.1{{- end }}
+        image: {{ with .Values }}{{ with .tunnel }}{{ with .auditor }}{{ with .init }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/tunnel-auditor-init:v0.13.2{{- end }}{{- else -}}signadot/tunnel-auditor-init:v0.13.2{{- end }}{{- else -}}signadot/tunnel-auditor-init:v0.13.2{{- end }}{{- else -}}signadot/tunnel-auditor-init:v0.13.2{{- end }}{{- else -}}signadot/tunnel-auditor-init:v0.13.2{{- end }}
         imagePullPolicy: {{ with .Values }}{{ with .tunnel }}{{ with .auditor }}{{ with .init }}{{ with .imagePullPolicy }}{{ . }}{{- else -}}"IfNotPresent"{{- end }}{{- else -}}"IfNotPresent"{{- end }}{{- else -}}"IfNotPresent"{{- end }}{{- else -}}"IfNotPresent"{{- end }}{{- else -}}"IfNotPresent"{{- end }}
         name: auditor-init
         securityContext:

From b1ec75a11972acb01481b3e5388a504c05d00f8f Mon Sep 17 00:00:00 2001
From: Scott Cotton <scott@mindowl.com>
Date: Wed, 2 Aug 2023 23:19:24 +0200
Subject: [PATCH 2/2] regenerate with kustomize 4.5.7 to avoid new
 `creationTimestamp`

---
 .../resources.signadot.com-customresourcedefinition.yaml         | 1 -
 .../operator/templates/signadot-manager-role-clusterrole.yaml    | 1 -
 signadot/operator/templates/signadot-manager-role-role.yaml      | 1 -
 ...ating-webhook-configuration-mutatingwebhookconfiguration.yaml | 1 -
 ...texternalworkloads.signadot.com-customresourcedefinition.yaml | 1 -
 ...ctlifecyclemethods.signadot.com-customresourcedefinition.yaml | 1 -
 ...dotresourceplugins.signadot.com-customresourcedefinition.yaml | 1 -
 .../signadotresources.signadot.com-customresourcedefinition.yaml | 1 -
 ...ignadotroutegroups.signadot.com-customresourcedefinition.yaml | 1 -
 .../signadotroutes.signadot.com-customresourcedefinition.yaml    | 1 -
 .../signadotsandboxes.signadot.com-customresourcedefinition.yaml | 1 -
 11 files changed, 11 deletions(-)

diff --git a/signadot/operator/templates/resources.signadot.com-customresourcedefinition.yaml b/signadot/operator/templates/resources.signadot.com-customresourcedefinition.yaml
index bf6b0b9..6c2a4f3 100644
--- a/signadot/operator/templates/resources.signadot.com-customresourcedefinition.yaml
+++ b/signadot/operator/templates/resources.signadot.com-customresourcedefinition.yaml
@@ -7,7 +7,6 @@ metadata:
     {{- range $key, $val := .Values.commonAnnotations }}
     {{ $key | quote }}: {{ $val | quote }}
     {{- end }}
-  creationTimestamp: null
   labels:
     {{- range $key, $val := .Values.commonLabels }}
     {{ $key | quote }}: {{ $val | quote }}
diff --git a/signadot/operator/templates/signadot-manager-role-clusterrole.yaml b/signadot/operator/templates/signadot-manager-role-clusterrole.yaml
index 8c0f55f..c0e7875 100644
--- a/signadot/operator/templates/signadot-manager-role-clusterrole.yaml
+++ b/signadot/operator/templates/signadot-manager-role-clusterrole.yaml
@@ -6,7 +6,6 @@ metadata:
     {{- range $key, $val := .Values.commonAnnotations }}
     {{ $key | quote }}: {{ $val | quote }}
     {{- end }}
-  creationTimestamp: null
   labels:
     {{- range $key, $val := .Values.commonLabels }}
     {{ $key | quote }}: {{ $val | quote }}
diff --git a/signadot/operator/templates/signadot-manager-role-role.yaml b/signadot/operator/templates/signadot-manager-role-role.yaml
index b88d7e0..f8e7b94 100644
--- a/signadot/operator/templates/signadot-manager-role-role.yaml
+++ b/signadot/operator/templates/signadot-manager-role-role.yaml
@@ -6,7 +6,6 @@ metadata:
     {{- range $key, $val := .Values.commonAnnotations }}
     {{ $key | quote }}: {{ $val | quote }}
     {{- end }}
-  creationTimestamp: null
   labels:
     {{- range $key, $val := .Values.commonLabels }}
     {{ $key | quote }}: {{ $val | quote }}
diff --git a/signadot/operator/templates/signadot-mutating-webhook-configuration-mutatingwebhookconfiguration.yaml b/signadot/operator/templates/signadot-mutating-webhook-configuration-mutatingwebhookconfiguration.yaml
index 637c164..812e88f 100644
--- a/signadot/operator/templates/signadot-mutating-webhook-configuration-mutatingwebhookconfiguration.yaml
+++ b/signadot/operator/templates/signadot-mutating-webhook-configuration-mutatingwebhookconfiguration.yaml
@@ -7,7 +7,6 @@ metadata:
     {{- range $key, $val := .Values.commonAnnotations }}
     {{ $key | quote }}: {{ $val | quote }}
     {{- end }}
-  creationTimestamp: "null"
   labels:
     {{- range $key, $val := .Values.commonLabels }}
     {{ $key | quote }}: {{ $val | quote }}
diff --git a/signadot/operator/templates/signadotexternalworkloads.signadot.com-customresourcedefinition.yaml b/signadot/operator/templates/signadotexternalworkloads.signadot.com-customresourcedefinition.yaml
index 7e2c522..aee25c9 100644
--- a/signadot/operator/templates/signadotexternalworkloads.signadot.com-customresourcedefinition.yaml
+++ b/signadot/operator/templates/signadotexternalworkloads.signadot.com-customresourcedefinition.yaml
@@ -7,7 +7,6 @@ metadata:
     {{- range $key, $val := .Values.commonAnnotations }}
     {{ $key | quote }}: {{ $val | quote }}
     {{- end }}
-  creationTimestamp: null
   labels:
     {{- range $key, $val := .Values.commonLabels }}
     {{ $key | quote }}: {{ $val | quote }}
diff --git a/signadot/operator/templates/signadotobjectlifecyclemethods.signadot.com-customresourcedefinition.yaml b/signadot/operator/templates/signadotobjectlifecyclemethods.signadot.com-customresourcedefinition.yaml
index 3e2c786..a788d8a 100644
--- a/signadot/operator/templates/signadotobjectlifecyclemethods.signadot.com-customresourcedefinition.yaml
+++ b/signadot/operator/templates/signadotobjectlifecyclemethods.signadot.com-customresourcedefinition.yaml
@@ -7,7 +7,6 @@ metadata:
     {{- range $key, $val := .Values.commonAnnotations }}
     {{ $key | quote }}: {{ $val | quote }}
     {{- end }}
-  creationTimestamp: null
   labels:
     {{- range $key, $val := .Values.commonLabels }}
     {{ $key | quote }}: {{ $val | quote }}
diff --git a/signadot/operator/templates/signadotresourceplugins.signadot.com-customresourcedefinition.yaml b/signadot/operator/templates/signadotresourceplugins.signadot.com-customresourcedefinition.yaml
index e6fda94..454ddb6 100644
--- a/signadot/operator/templates/signadotresourceplugins.signadot.com-customresourcedefinition.yaml
+++ b/signadot/operator/templates/signadotresourceplugins.signadot.com-customresourcedefinition.yaml
@@ -7,7 +7,6 @@ metadata:
     {{- range $key, $val := .Values.commonAnnotations }}
     {{ $key | quote }}: {{ $val | quote }}
     {{- end }}
-  creationTimestamp: null
   labels:
     {{- range $key, $val := .Values.commonLabels }}
     {{ $key | quote }}: {{ $val | quote }}
diff --git a/signadot/operator/templates/signadotresources.signadot.com-customresourcedefinition.yaml b/signadot/operator/templates/signadotresources.signadot.com-customresourcedefinition.yaml
index cad48b9..70ce0b2 100644
--- a/signadot/operator/templates/signadotresources.signadot.com-customresourcedefinition.yaml
+++ b/signadot/operator/templates/signadotresources.signadot.com-customresourcedefinition.yaml
@@ -7,7 +7,6 @@ metadata:
     {{- range $key, $val := .Values.commonAnnotations }}
     {{ $key | quote }}: {{ $val | quote }}
     {{- end }}
-  creationTimestamp: null
   labels:
     {{- range $key, $val := .Values.commonLabels }}
     {{ $key | quote }}: {{ $val | quote }}
diff --git a/signadot/operator/templates/signadotroutegroups.signadot.com-customresourcedefinition.yaml b/signadot/operator/templates/signadotroutegroups.signadot.com-customresourcedefinition.yaml
index fd87907..cb277d4 100644
--- a/signadot/operator/templates/signadotroutegroups.signadot.com-customresourcedefinition.yaml
+++ b/signadot/operator/templates/signadotroutegroups.signadot.com-customresourcedefinition.yaml
@@ -7,7 +7,6 @@ metadata:
     {{- range $key, $val := .Values.commonAnnotations }}
     {{ $key | quote }}: {{ $val | quote }}
     {{- end }}
-  creationTimestamp: null
   labels:
     {{- range $key, $val := .Values.commonLabels }}
     {{ $key | quote }}: {{ $val | quote }}
diff --git a/signadot/operator/templates/signadotroutes.signadot.com-customresourcedefinition.yaml b/signadot/operator/templates/signadotroutes.signadot.com-customresourcedefinition.yaml
index 2f22145..efadc52 100644
--- a/signadot/operator/templates/signadotroutes.signadot.com-customresourcedefinition.yaml
+++ b/signadot/operator/templates/signadotroutes.signadot.com-customresourcedefinition.yaml
@@ -7,7 +7,6 @@ metadata:
     {{- range $key, $val := .Values.commonAnnotations }}
     {{ $key | quote }}: {{ $val | quote }}
     {{- end }}
-  creationTimestamp: null
   labels:
     {{- range $key, $val := .Values.commonLabels }}
     {{ $key | quote }}: {{ $val | quote }}
diff --git a/signadot/operator/templates/signadotsandboxes.signadot.com-customresourcedefinition.yaml b/signadot/operator/templates/signadotsandboxes.signadot.com-customresourcedefinition.yaml
index dbbc9e7..43acd2d 100644
--- a/signadot/operator/templates/signadotsandboxes.signadot.com-customresourcedefinition.yaml
+++ b/signadot/operator/templates/signadotsandboxes.signadot.com-customresourcedefinition.yaml
@@ -7,7 +7,6 @@ metadata:
     {{- range $key, $val := .Values.commonAnnotations }}
     {{ $key | quote }}: {{ $val | quote }}
     {{- end }}
-  creationTimestamp: null
   labels:
     {{- range $key, $val := .Values.commonLabels }}
     {{ $key | quote }}: {{ $val | quote }}