From ec6852c287535a4876e6e3cfbd16fdf1806b3867 Mon Sep 17 00:00:00 2001
From: Adam Vollrath <adam.d.vollrath@gmail.com>
Date: Tue, 23 May 2023 15:16:10 -0500
Subject: [PATCH] Helm chart metadata update and progress towards using
 `common` library. #418

---
 charts/uffizzi-app/Chart.yaml                 | 14 +++++++---
 .../templates/sidekiq-deployment.yaml         |  4 +--
 .../uffizzi-app/templates/web-deployment.yaml |  4 +--
 charts/uffizzi-app/values.yaml                | 28 +++++++++++++++++--
 4 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/charts/uffizzi-app/Chart.yaml b/charts/uffizzi-app/Chart.yaml
index 154d9177..a31d5df4 100644
--- a/charts/uffizzi-app/Chart.yaml
+++ b/charts/uffizzi-app/Chart.yaml
@@ -20,15 +20,20 @@ home: https://uffizzi.com/
 sources:
   - https://github.com/UffizziCloud/uffizzi
 dependencies:
+  - name: common
+    repository: oci://registry-1.docker.io/bitnamicharts
+    tags:
+      - bitnami-common
+    version: 2.x.x
   - name: uffizzi-controller
-    version: "1.1.0"
+    version: "1.1.x"
     repository: https://uffizzicloud.github.io/uffizzi_controller/
   - name: postgresql
-    version: "12.5.5"
+    version: "12.x.x"
     repository: https://charts.bitnami.com/bitnami
     condition: postgresql.enabled
   - name: redis
-    version: "17.11.3"
+    version: "17.x.x"
     repository: https://charts.bitnami.com/bitnami
     condition: redis.enabled
 maintainers:
@@ -42,6 +47,7 @@ icon: https://app.uffizzi.com/favicon.png
 appVersion: "1.2.1"
 deprecated: false
 annotations:
-  # Use this annotation to indicate that this chart version is a pre-release.
   # https://artifacthub.io/docs/topics/annotations/helm/
   artifacthub.io/prerelease: "false"
+  artifacthub.io/category: integration-delivery
+  artifacthub.io/license: Apache-2.0
diff --git a/charts/uffizzi-app/templates/sidekiq-deployment.yaml b/charts/uffizzi-app/templates/sidekiq-deployment.yaml
index 18834124..46e01e55 100644
--- a/charts/uffizzi-app/templates/sidekiq-deployment.yaml
+++ b/charts/uffizzi-app/templates/sidekiq-deployment.yaml
@@ -6,7 +6,7 @@ metadata:
     app: uffizzi-sidekiq
 
 spec:
-  replicas: {{ .Values.sidekiq_replicas }}
+  replicas: {{ .Values.sidekiq.replicas }}
   selector:
     matchLabels:
       app: uffizzi-sidekiq
@@ -19,7 +19,7 @@ spec:
       automountServiceAccountToken: false
       containers:
       - name: uffizzi-sidekiq
-        image: {{ .Values.image }}
+        image: {{ .Values.sidekiq.image }}
         command:
         - /bin/bash
         - -c
diff --git a/charts/uffizzi-app/templates/web-deployment.yaml b/charts/uffizzi-app/templates/web-deployment.yaml
index e8ccc05b..b01a3841 100644
--- a/charts/uffizzi-app/templates/web-deployment.yaml
+++ b/charts/uffizzi-app/templates/web-deployment.yaml
@@ -6,7 +6,7 @@ metadata:
     app: uffizzi-web
 
 spec:
-  replicas: {{ .Values.web_replicas }}
+  replicas: {{ .Values.web.replicas }}
   selector:
     matchLabels:
       app: uffizzi-web
@@ -19,7 +19,7 @@ spec:
       automountServiceAccountToken: false
       containers:
       - name: uffizzi-web
-        image: {{ .Values.image }}
+        image: {{ .Values.web.image }}
         command:
         - /bin/bash
         - -c
diff --git a/charts/uffizzi-app/values.yaml b/charts/uffizzi-app/values.yaml
index 8508ab78..7a9e844b 100644
--- a/charts/uffizzi-app/values.yaml
+++ b/charts/uffizzi-app/values.yaml
@@ -19,12 +19,34 @@ global:
       username: username
       password: ChangeMeNow
 
+  # Please note that this will override the image parameters, including dependencies, configured to use the global value.
+  # Global Docker image registry
+  imageRegistry: ""
+  # Global Docker registry secret names as an array
+  # example: `imagePullSecrets: [myRegistryKeySecretName]`
+  imagePullSecrets: []
+
+web:
+  replicas: 3
+  image:
+    registry: ""
+    repository: uffizzi/app
+    tag: latest
+    pullPolicy: Always
+    pullSecrets: []
+
+sidekiq:
+  replicas: 1
+  image:
+    registry: ""
+    repository: uffizzi/app
+    tag: latest
+    pullPolicy: Always
+    pullSecrets: []
+
 env: production
 app_url: https://uffizzi.example.com
 webHostname: uffizzi.example.com
-image: uffizzi/app
-web-replicas: 3
-sidekiq-replicas: 1
 hostname: localhost
 controller_url: ""
 allowed_hosts: ""