From e12a205f5ff4565ab2ce5938ad1670815bf73513 Mon Sep 17 00:00:00 2001 From: douglas-gibbons-lark <65254342+douglas-gibbons-lark@users.noreply.github.com> Date: Tue, 12 Mar 2024 11:38:06 -0700 Subject: [PATCH] Configurable image repositories (#103) * Added image repository configuration * Version increment --- README.md | 4 ++++ charts/terrakube/Chart.yaml | 2 +- charts/terrakube/templates/deployment-api.yaml | 2 +- charts/terrakube/templates/deployment-executor.yaml | 2 +- charts/terrakube/templates/deployment-registry.yaml | 2 +- charts/terrakube/templates/deployment-ui.yaml | 2 +- charts/terrakube/values.yaml | 4 ++++ 7 files changed, 13 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index a338988..c5e9ef3 100644 --- a/README.md +++ b/README.md @@ -258,6 +258,7 @@ Once you have completed the above steps you can complete the file values.yaml to | api.enabled | Yes | true/false | | api.defaultRedis | No | Enable default Redis using Bitnami helm chart | | api.defaultDatabase | No | Enable default database using postgresql helm chart | +| api.image | No | API image repository | | api.version | Yes | Terrakube API version | | api.replicaCount | Yes | | | api.serviceAccountName | No | Kubernetes Service Account name | @@ -273,6 +274,7 @@ Once you have completed the above steps you can complete the file values.yaml to | api.securityContext | No | Fill securityContext field | | api.containerSecurityContext | No | Fill securityContext field in the container spec | | executor.enabled | Yes | true/false | +| executor.image | No | Executor image repository | | executor.version | Yes | Terrakube Executor version | | executor.replicaCount | Yes | | | executor.serviceAccountName | No | Kubernetes Service Account name | @@ -285,6 +287,7 @@ Once you have completed the above steps you can complete the file values.yaml to | executor.securityContext | No | Fill securityContext field | | executor.containerSecurityContext | No | Fill securityContext field in the container spec | | registry.enabled | Yes | | +| registry.image | No | Registry image repository | | registry.version | Yes | | | registry.replicaCount | Yes | | | registry.serviceAccountName | No | Kubernetes Service Account name | @@ -295,6 +298,7 @@ Once you have completed the above steps you can complete the file values.yaml to | registry.securityContext | No | Fill securityContext field | | registry.containerSecurityContext | No | Fill securityContext field in the container spec | | ui.enabled | Yes | true/false | +| ui.image | No | UI image repository | | ui.version | Yes | | | ui.replicaCount | Yes | | | ui.serviceAccountName | No | Kubernetes Service Account name | diff --git a/charts/terrakube/Chart.yaml b/charts/terrakube/Chart.yaml index d2bde39..655883a 100644 --- a/charts/terrakube/Chart.yaml +++ b/charts/terrakube/Chart.yaml @@ -15,7 +15,7 @@ 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: 3.15.1 +version: 3.15.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 diff --git a/charts/terrakube/templates/deployment-api.yaml b/charts/terrakube/templates/deployment-api.yaml index 538b0fa..0c36553 100644 --- a/charts/terrakube/templates/deployment-api.yaml +++ b/charts/terrakube/templates/deployment-api.yaml @@ -22,7 +22,7 @@ spec: spec: containers: - name: terrakube-api - image: azbuilder/api-server:{{ default .Chart.AppVersion .Values.api.version }} + image: {{ .Values.api.image }}:{{ default .Chart.AppVersion .Values.api.version }} {{- if .Values.api.resources }} resources: {{- toYaml .Values.api.resources | nindent 12 }} {{- end }} diff --git a/charts/terrakube/templates/deployment-executor.yaml b/charts/terrakube/templates/deployment-executor.yaml index af53978..9615dc8 100644 --- a/charts/terrakube/templates/deployment-executor.yaml +++ b/charts/terrakube/templates/deployment-executor.yaml @@ -22,7 +22,7 @@ spec: spec: containers: - name: terrakube-executor - image: azbuilder/executor:{{ default .Chart.AppVersion .Values.executor.version }} + image: {{ .Values.executor.image }}:{{ default .Chart.AppVersion .Values.executor.version }} {{- if .Values.executor.resources }} resources: {{- toYaml .Values.executor.resources | nindent 12 }} {{- end }} diff --git a/charts/terrakube/templates/deployment-registry.yaml b/charts/terrakube/templates/deployment-registry.yaml index 800834e..a80bf8a 100644 --- a/charts/terrakube/templates/deployment-registry.yaml +++ b/charts/terrakube/templates/deployment-registry.yaml @@ -22,7 +22,7 @@ spec: spec: containers: - name: terrakube-registry - image: azbuilder/open-registry:{{ default .Chart.AppVersion .Values.registry.version }} + image: {{ .Values.registry.image }}:{{ default .Chart.AppVersion .Values.registry.version }} {{- if .Values.registry.resources }} resources: {{- toYaml .Values.registry.resources | nindent 12 }} {{- end }} diff --git a/charts/terrakube/templates/deployment-ui.yaml b/charts/terrakube/templates/deployment-ui.yaml index 025d03f..43d4902 100644 --- a/charts/terrakube/templates/deployment-ui.yaml +++ b/charts/terrakube/templates/deployment-ui.yaml @@ -22,7 +22,7 @@ spec: spec: containers: - name: terrakube-ui - image: azbuilder/terrakube-ui:{{ default .Chart.AppVersion .Values.ui.version }} + image: {{ .Values.ui.image }}:{{ default .Chart.AppVersion .Values.ui.version }} volumeMounts: - name: ui-config mountPath: "/app/env-config.js" diff --git a/charts/terrakube/values.yaml b/charts/terrakube/values.yaml index 320e94a..61fa347 100644 --- a/charts/terrakube/values.yaml +++ b/charts/terrakube/values.yaml @@ -163,6 +163,7 @@ redis: api: existingSecret: false enabled: true + image: azbuilder/api-server version: "" replicaCount: "1" serviceType: "ClusterIP" @@ -202,6 +203,7 @@ api: executor: existingSecret: false enabled: true + image: "azbuilder/executor" version: "" replicaCount: "1" serviceType: "ClusterIP" @@ -217,6 +219,7 @@ executor: registry: enabled: true existingSecret: false + image: azbuilder/open-registry version: "" replicaCount: "1" serviceType: "ClusterIP" @@ -230,6 +233,7 @@ registry: ui: enabled: true existingSecret: false + image: azbuilder/terrakube-ui version: "" replicaCount: "1" serviceType: "ClusterIP"