From 1a33433f0ef7e9a6c9461a23be23bb72f73983e5 Mon Sep 17 00:00:00 2001 From: Daniel De Vera Date: Thu, 7 Sep 2023 12:04:54 -0300 Subject: [PATCH 1/2] Addition of routeInit.legacy.image and routeSidecar.legacy.image --- signadot/operator/README.md | 68 ++++++++++++++++++----------------- signadot/operator/values.yaml | 6 +++- 2 files changed, 40 insertions(+), 34 deletions(-) diff --git a/signadot/operator/README.md b/signadot/operator/README.md index 3b1db2c..ff86175 100644 --- a/signadot/operator/README.md +++ b/signadot/operator/README.md @@ -68,39 +68,41 @@ kubectl delete ns signadot ### Image customization parameters -| Name | Description | Default | -| ------------------------------------- | ------------------------------------------- | -------------- | -| `operator.image` | Operator image override | `""` | -| `operator.imagePullPolicy` | Operator image pull policy | `IfNotPresent` | -| `agent.image` | Agent image override | `""` | -| `agent.imagePullPolicy` | Agent image pull policy | `IfNotPresent` | -| `routeServer.image` | Route Server image override | `""` | -| `routeServer.imagePullPolicy` | Route Server image pull policy | `IfNotPresent` | -| `ioContextServer.image` | IO Context Server image override | `""` | -| `ioContextServer.imagePullPolicy` | IO Context Server image pull policy | `IfNotPresent` | -| `kubeRBACProxy.image` | Kube-rbac-proxy image override | `""` | -| `kubeRBACProxy.imagePullPolicy` | Kube-rbac-proxy image pull policy | `IfNotPresent` | -| `routeInit.image` | Route Init container image override | `""` | -| `routeInit.imagePullPolicy` | Route Init container image pull policy | `IfNotPresent` | -| `routeInit.imagePullSecret` | Route Init container image pull secret | `""` | -| `routeSidecar.image` | Route Sidecar container image override | `""` | -| `routeSidecar.imagePullPolicy` | Route Sidecar container image pull policy | `IfNotPresent` | -| `routeSidecar.imagePullSecret` | Route Sidecar container image pull secret | `""` | -| `ioInit.image` | IO Init container image override | `""` | -| `ioInit.imagePullPolicy` | IO Init container image pull policy | `IfNotPresent` | -| `ioInit.imagePullSecret` | IO Init container image pull secret | `""` | -| `ioSidecar.image` | IO Sidecar container image override | `""` | -| `ioSidecar.imagePullPolicy` | IO Sidecar container image pull policy | `IfNotPresent` | -| `ioSidecar.imagePullSecret` | IO Sidecar container image pull secret | `""` | -| `execpodSidecar.image` | ExecPod Sidecar container image override | `""` | -| `execpodSidecar.imagePullPolicy` | ExecPod Sidecar container image pull policy | `IfNotPresent` | -| `execpodSidecar.imagePullSecret` | ExecPod Sidecar container image pull secret | `""` | -| `tunnel.api.image` | Tunnel API image override | `""` | -| `tunnel.api.imagePullPolicy` | Tunnel API image pull policy | `IfNotPresent` | -| `tunnel.proxy.image` | Tunnel Proxy image override | `""` | -| `tunnel.proxy.imagePullPolicy` | Tunnel Proxy image pull policy | `IfNotPresent` | -| `tunnel.auditor.init.image` | Tunnel Auditor init image override | `""` | -| `tunnel.auditor.init.imagePullPolicy` | Tunnel Auditor init image pull policy | `IfNotPresent` | +| Name | Description | Default | +| ------------------------------------- | ------------------------------------------------------- | -------------- | +| `operator.image` | Operator image override | `""` | +| `operator.imagePullPolicy` | Operator image pull policy | `IfNotPresent` | +| `agent.image` | Agent image override | `""` | +| `agent.imagePullPolicy` | Agent image pull policy | `IfNotPresent` | +| `routeServer.image` | Route Server image override | `""` | +| `routeServer.imagePullPolicy` | Route Server image pull policy | `IfNotPresent` | +| `ioContextServer.image` | IO Context Server image override | `""` | +| `ioContextServer.imagePullPolicy` | IO Context Server image pull policy | `IfNotPresent` | +| `kubeRBACProxy.image` | Kube-rbac-proxy image override | `""` | +| `kubeRBACProxy.imagePullPolicy` | Kube-rbac-proxy image pull policy | `IfNotPresent` | +| `routeInit.image` | Route Init container image override | `""` | +| `routeInit.legacy.image` | Route Init container image override (legacy version) | | +| `routeInit.imagePullPolicy` | Route Init container image pull policy | `IfNotPresent` | +| `routeInit.imagePullSecret` | Route Init container image pull secret | `""` | +| `routeSidecar.image` | Route Sidecar container image override | `""` | +| `routeSidecar.legacy.image` | Route Sidecar container image override (legacy version) | `""` | +| `routeSidecar.imagePullPolicy` | Route Sidecar container image pull policy | `IfNotPresent` | +| `routeSidecar.imagePullSecret` | Route Sidecar container image pull secret | `""` | +| `ioInit.image` | IO Init container image override | `""` | +| `ioInit.imagePullPolicy` | IO Init container image pull policy | `IfNotPresent` | +| `ioInit.imagePullSecret` | IO Init container image pull secret | `""` | +| `ioSidecar.image` | IO Sidecar container image override | `""` | +| `ioSidecar.imagePullPolicy` | IO Sidecar container image pull policy | `IfNotPresent` | +| `ioSidecar.imagePullSecret` | IO Sidecar container image pull secret | `""` | +| `execpodSidecar.image` | ExecPod Sidecar container image override | `""` | +| `execpodSidecar.imagePullPolicy` | ExecPod Sidecar container image pull policy | `IfNotPresent` | +| `execpodSidecar.imagePullSecret` | ExecPod Sidecar container image pull secret | `""` | +| `tunnel.api.image` | Tunnel API image override | `""` | +| `tunnel.api.imagePullPolicy` | Tunnel API image pull policy | `IfNotPresent` | +| `tunnel.proxy.image` | Tunnel Proxy image override | `""` | +| `tunnel.proxy.imagePullPolicy` | Tunnel Proxy image pull policy | `IfNotPresent` | +| `tunnel.auditor.init.image` | Tunnel Auditor init image override | `""` | +| `tunnel.auditor.init.imagePullPolicy` | Tunnel Auditor init image pull policy | `IfNotPresent` | ### Tunnel parameters diff --git a/signadot/operator/values.yaml b/signadot/operator/values.yaml index 5d87b67..3d7fa01 100644 --- a/signadot/operator/values.yaml +++ b/signadot/operator/values.yaml @@ -54,12 +54,16 @@ # imagePullPolicy: Always # routeInit: -# image: my-private-registry/signadot/sd-init-networking:latest +# image: my-private-registry/signadot/route-sidecar-init:latest +# legacy: +# image: my-private-registry/signadot/sd-init-networking:latest # imagePullPolicy: Always # imagePullSecret: secret-routeInit # routeSidecar: # image: my-private-registry/signadot/route-sidecar:latest +# legacy: +# image: my-private-registry/signadot/route-sidecar-legacy:latest # imagePullPolicy: Always # imagePullSecret: secret-routeSidecar From 6e81d0f0766af5bc81f1eaab355803d357a56dbb Mon Sep 17 00:00:00 2001 From: Daniel De Vera Date: Fri, 8 Sep 2023 16:13:14 -0300 Subject: [PATCH 2/2] Release v0.13.3 --- signadot/operator/Chart.yaml | 4 ++-- .../operator/templates/agent-deployment.yaml | 2 +- .../templates/io-context-server-deployment.yaml | 2 +- .../templates/routeserver-deployment.yaml | 2 +- .../signadot-controller-manager-deployment.yaml | 16 ++++++++++------ .../templates/tunnel-api-deployment.yaml | 2 +- .../templates/tunnel-proxy-deployment.yaml | 4 ++-- 7 files changed, 18 insertions(+), 14 deletions(-) diff --git a/signadot/operator/Chart.yaml b/signadot/operator/Chart.yaml index 3cfd7af..a0ff95c 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.2" +version: "0.13.3" # 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.2" +appVersion: "0.13.3" diff --git a/signadot/operator/templates/agent-deployment.yaml b/signadot/operator/templates/agent-deployment.yaml index e432707..8ec553a 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.2{{- end }}{{- else -}}signadot/agent:v0.13.2{{- end }}{{- else -}}signadot/agent:v0.13.2{{- end }} + image: {{ with .Values }}{{ with .agent }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/agent:v0.13.3{{- end }}{{- else -}}signadot/agent:v0.13.3{{- end }}{{- else -}}signadot/agent:v0.13.3{{- 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 da6189a..8e81d6a 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.2{{- end }}{{- else -}}signadot/io-context-server:v0.13.2{{- end }}{{- else -}}signadot/io-context-server:v0.13.2{{- end }} + image: {{ with .Values }}{{ with .ioContextServer }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/io-context-server:v0.13.3{{- end }}{{- else -}}signadot/io-context-server:v0.13.3{{- end }}{{- else -}}signadot/io-context-server:v0.13.3{{- 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/routeserver-deployment.yaml b/signadot/operator/templates/routeserver-deployment.yaml index 0487a79..1805204 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.2{{- end }}{{- else -}}signadot/route-server:v0.13.2{{- end }}{{- else -}}signadot/route-server:v0.13.2{{- end }} + - image: {{ with .Values }}{{ with .routeServer }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/route-server:v0.13.3{{- end }}{{- else -}}signadot/route-server:v0.13.3{{- end }}{{- else -}}signadot/route-server:v0.13.3{{- 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 7905293..9a575d9 100644 --- a/signadot/operator/templates/signadot-controller-manager-deployment.yaml +++ b/signadot/operator/templates/signadot-controller-manager-deployment.yaml @@ -78,16 +78,20 @@ spec: - name: EXECPOD_SIDECAR_IMAGE_PULL_SECRET value: {{ with .Values }}{{ with .execpodSidecar }}{{ with .imagePullSecret }}{{ . }}{{- else -}}""{{- end }}{{- else -}}""{{- end }}{{- else -}}""{{- end }} - 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 }} + value: {{ with .Values }}{{ with .routeInit }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/route-sidecar-init:v0.13.3{{- end }}{{- else -}}signadot/route-sidecar-init:v0.13.3{{- end }}{{- else -}}signadot/route-sidecar-init:v0.13.3{{- end }} + - name: LEGACY_SIDECAR_INIT_IMAGE + value: {{ with .Values }}{{ with .routeInit }}{{ with .legacy }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/sd-init-networking:latest{{- end }}{{- 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.2{{- end }}{{- else -}}signadot/route-sidecar:v0.13.2{{- end }}{{- else -}}signadot/route-sidecar:v0.13.2{{- end }} + value: {{ with .Values }}{{ with .routeSidecar }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/route-sidecar:v0.13.3{{- end }}{{- else -}}signadot/route-sidecar:v0.13.3{{- end }}{{- else -}}signadot/route-sidecar:v0.13.3{{- end }} + - name: LEGACY_ROUTE_SIDECAR_IMAGE + value: {{ with .Values }}{{ with .routeSidecar }}{{ with .legacy }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/route-sidecar-legacy:v0.13.3{{- end }}{{- else -}}signadot/route-sidecar-legacy:v0.13.3{{- end }}{{- else -}}signadot/route-sidecar-legacy:v0.13.3{{- end }}{{- else -}}signadot/route-sidecar-legacy:v0.13.3{{- end }} - name: EXECPOD_SIDECAR_IMAGE - 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 }} + value: {{ with .Values }}{{ with .execpodSidecar }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/execpod-sidecar:v0.13.3{{- end }}{{- else -}}signadot/execpod-sidecar:v0.13.3{{- end }}{{- else -}}signadot/execpod-sidecar:v0.13.3{{- end }} - name: IO_INIT_IMAGE - 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 }} + value: {{ with .Values }}{{ with .ioInit }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/io-init:v0.13.3{{- end }}{{- else -}}signadot/io-init:v0.13.3{{- end }}{{- else -}}signadot/io-init:v0.13.3{{- end }} - name: IO_SIDECAR_IMAGE - 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 }} + value: {{ with .Values }}{{ with .ioSidecar }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/io-sidecar:v0.13.3{{- end }}{{- else -}}signadot/io-sidecar:v0.13.3{{- end }}{{- else -}}signadot/io-sidecar:v0.13.3{{- end }} + image: {{ with .Values }}{{ with .operator }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/operator:v0.13.3{{- end }}{{- else -}}signadot/operator:v0.13.3{{- end }}{{- else -}}signadot/operator:v0.13.3{{- 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/tunnel-api-deployment.yaml b/signadot/operator/templates/tunnel-api-deployment.yaml index 7beed5b..8e119d1 100644 --- a/signadot/operator/templates/tunnel-api-deployment.yaml +++ b/signadot/operator/templates/tunnel-api-deployment.yaml @@ -45,7 +45,7 @@ spec: {{- 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 }} + image: {{ with .Values }}{{ with .tunnel }}{{ with .api }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/tunnel-api:v0.13.3{{- end }}{{- else -}}signadot/tunnel-api:v0.13.3{{- end }}{{- else -}}signadot/tunnel-api:v0.13.3{{- end }}{{- else -}}signadot/tunnel-api:v0.13.3{{- 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: diff --git a/signadot/operator/templates/tunnel-proxy-deployment.yaml b/signadot/operator/templates/tunnel-proxy-deployment.yaml index 86efef7..36011ee 100644 --- a/signadot/operator/templates/tunnel-proxy-deployment.yaml +++ b/signadot/operator/templates/tunnel-proxy-deployment.yaml @@ -53,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.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 }} + image: {{ with .Values }}{{ with .tunnel }}{{ with .proxy }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/tunnel-proxy:v0.13.3{{- end }}{{- else -}}signadot/tunnel-proxy:v0.13.3{{- end }}{{- else -}}signadot/tunnel-proxy:v0.13.3{{- end }}{{- else -}}signadot/tunnel-proxy:v0.13.3{{- 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: @@ -97,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.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 }} + image: {{ with .Values }}{{ with .tunnel }}{{ with .auditor }}{{ with .init }}{{ with .image }}{{ . | quote}}{{- else -}}signadot/tunnel-auditor-init:v0.13.3{{- end }}{{- else -}}signadot/tunnel-auditor-init:v0.13.3{{- end }}{{- else -}}signadot/tunnel-auditor-init:v0.13.3{{- end }}{{- else -}}signadot/tunnel-auditor-init:v0.13.3{{- end }}{{- else -}}signadot/tunnel-auditor-init:v0.13.3{{- 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: