Support for native Kubernetes

Signed-off-by: Andrew Block <andy.block@gmail.com>
RH-Telescope · Dec 27, 2023 · b279105 · b279105
1 parent 2810932
commit b279105
Show file tree

Hide file tree

Showing 37 changed files with 1,436 additions and 741 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -26,11 +26,11 @@ jobs:
           git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
 
       - name: Set up Helm
-        uses: azure/setup-helm@b5b231a831f96336bbfeccc1329990f0005c5bb1 # pin@v3.3
+        uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78 # pin@v3.5
         with:
-          version: v3.9.3
+          version: v3.13.2
 
       - name: Run chart-releaser
-        uses: helm/chart-releaser-action@a3454e46a6f5ac4811069a381e646961dda2e1bf # pin@v1.4.0
+        uses: helm/chart-releaser-action@a917fd15b20e8b64b94d9158ad54cd6345335584 # pin@v1.6.0
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,19 +14,19 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: sigstore/cosign-installer@f3c664df7af409cb4873aa5068053ba9d61a57b6 # pin@v2.5.0
+      - uses: sigstore/cosign-installer@9614fae9e5c5eddabb09f90a270fcb487c9f7149 # pin@v3.3.0
 
       - name: Set up Helm
-        uses: azure/setup-helm@b5b231a831f96336bbfeccc1329990f0005c5bb1 # pin@v3.3
+        uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78 # pin@v3.5
         with:
-          version: v3.9.3
+          version: v3.13.2
 
       - uses: actions/setup-python@b55428b1882923874294fa556849718a1d7f2ca5 # pin@v4
         with:
           python-version: 3.7
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@09ed88797198755e5031f25be13da255e7e33aad # pin@v2.3.0
+        uses: helm/chart-testing-action@e6669bcd63d7cb57cb4380c33043eebe5d111992 # pin@v2.6.1
 
       - name: Run chart-testing (lint)
         run: ct lint --config ct.yaml

diff --git a/charts/postgresql/Chart.yaml b/charts/postgresql/Chart.yaml
@@ -1,4 +1,7 @@
 apiVersion: v2
 name: postgresql
 description: Postgresql Helm Chart
-version: 0.3.2
+version: 0.4.0
+home: https://project-telescope.com
+sources:
+  - https://github.com/RH-Telescope/helm-charts
diff --git a/charts/postgresql/README.md b/charts/postgresql/README.md
@@ -0,0 +1,39 @@
+# postgresql
+
+![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square)
+
+Postgresql Helm Chart
+
+**Homepage:** <https://project-telescope.com>
+
+## Source Code
+
+* <https://github.com/RH-Telescope/helm-charts>
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| postgresql.autogenImage | string | `"docker.io/bitnami/kubectl:latest"` |  |
+| postgresql.autogenPassword | bool | `true` |  |
+| postgresql.database | string | `"telescope"` |  |
+| postgresql.envVarKeys.database | string | `"POSTGRES_DB"` |  |
+| postgresql.envVarKeys.password | string | `"POSTGRES_PASSWORD"` |  |
+| postgresql.envVarKeys.user | string | `"POSTGRES_USER"` |  |
+| postgresql.external | bool | `false` |  |
+| postgresql.image | string | `"docker.io/postgres:13"` |  |
+| postgresql.port | int | `5432` |  |
+| postgresql.resources.limits.cpu | string | `"400m"` |  |
+| postgresql.resources.limits.memory | string | `"596Mi"` |  |
+| postgresql.resources.requests.cpu | string | `"100m"` |  |
+| postgresql.resources.requests.memory | string | `"128Mi"` |  |
+| postgresql.storage.enabled | bool | `true` |  |
+| postgresql.storage.mountPath | string | `"/var/lib/postgresql"` |  |
+| postgresql.storage.size | string | `"2Gi"` |  |
+| postgresql.storage.storageClass | string | `""` |  |
+| postgresql.user | string | `"telescope"` |  |
+| resources | object | `{}` |  |
+| serviceAccount.annotations | object | `{}` |  |
+| serviceAccount.create | bool | `true` |  |
+
+----------------------------------------------
diff --git a/charts/postgresql/templates/statefulset.yaml b/charts/postgresql/templates/statefulset.yaml
@@ -20,17 +20,17 @@ spec:
       containers:
         - name: postgresql
           env:
-            - name: POSTGRESQL_PASSWORD
+            - name: {{ .Values.postgresql.envVarKeys.password }}
               valueFrom:
                 secretKeyRef:
                   name: {{ include "postgresql.fullname" . }}
                   key: databasePassword
-            - name: POSTGRESQL_USER
+            - name: {{ .Values.postgresql.envVarKeys.user }}
               valueFrom:
                 secretKeyRef:
                   name: {{ include "postgresql.fullname" . }}
                   key: databaseUser
-            - name: POSTGRESQL_DATABASE
+            - name: {{ .Values.postgresql.envVarKeys.database }}
               valueFrom:
                 secretKeyRef:
                   name: {{ include "postgresql.fullname" . }}
@@ -41,7 +41,7 @@ spec:
               protocol: TCP
 {{- if .Values.postgresql.storage.enabled }}
           volumeMounts:
-            - mountPath: /var/lib/pgsql/data
+            - mountPath: {{ .Values.postgresql.storage.mountPath }}
               name: postgresdb
 {{- end }}
           terminationMessagePolicy: File
@@ -56,7 +56,7 @@ spec:
               command:
                 - /bin/sh
                 - -c
-                - exec pg_isready -U "$POSTGRESQL_USER" -d "dbname=$POSTGRESQL_DATABASE" -h 127.0.0.1 -p {{ .Values.postgresql.port }}
+                - exec pg_isready -U "${{ .Values.postgresql.envVarKeys.user }}" -d "dbname=${{ .Values.postgresql.envVarKeys.database }}" -h 127.0.0.1 -p {{ .Values.postgresql.port }}
           readinessProbe:
             failureThreshold: 6
             initialDelaySeconds: 5
@@ -68,7 +68,7 @@ spec:
                 - /bin/sh
                 - -c
                 - -e
-                - exec pg_isready -U "$POSTGRESQL_USER" -d "dbname=$POSTGRESQL_DATABASE" -h 127.0.0.1 -p {{ .Values.postgresql.port }}
+                - exec pg_isready -U "${{ .Values.postgresql.envVarKeys.user }}" -d "dbname=${{ .Values.postgresql.envVarKeys.database }}" -h 127.0.0.1 -p {{ .Values.postgresql.port }}
       serviceAccount: {{ include "postgresql.serviceAccountName" . }}
       volumes:
       - name: postgresdb

diff --git a/charts/postgresql/values-openshift.yaml b/charts/postgresql/values-openshift.yaml
@@ -0,0 +1,11 @@
+---
+
+postgresql:
+  storage:
+    mountPath: /var/lib/pgsql/data
+  envVarKeys:
+    database: POSTGRESQL_DATABASE
+    user: POSTGRESQL_USER
+    password: POSTGRESQL_PASSWORD
+  image: registry.redhat.io/rhel9/postgresql-13:latest
+  autogenImage: registry.redhat.io/openshift4/ose-cli:latest
diff --git a/charts/postgresql/values.schema.json b/charts/postgresql/values.schema.json
@@ -31,12 +31,19 @@
                             "examples": [
                                 ""
                             ]
+                        },
+                        "mountPath": {
+                            "type": "string",
+                            "examples": [
+                                "/var/lib/postgresql"
+                            ]
                         }
                     },
                     "examples": [{
                         "enabled": true,
                         "size": "2Gi",
-                        "storageClass": ""
+                        "storageClass": "",
+                        "mountPath": "/var/lib/postgresql"
                     }]
                 },
                 "user": {
@@ -51,6 +58,34 @@
                         "telescope"
                     ]
                 },
+                "envVarKeys": {
+                    "type": "object",
+                    "properties": {
+                        "database": {
+                            "type": "string",
+                            "examples": [
+                                "POSTGRES_DB"
+                            ]
+                        },
+                        "user": {
+                            "type": "string",
+                            "examples": [
+                                "POSTGRES_USER"
+                            ]
+                        },
+                        "password": {
+                            "type": "string",
+                            "examples": [
+                                "POSTGRES_PASSWORD"
+                            ]
+                        }
+                    },
+                    "examples": [{
+                        "database": "POSTGRES_DB",
+                        "user": "POSTGRES_USER",
+                        "password": "POSTGRES_PASSWORD"
+                    }]
+                },
                 "autogenPassword": {
                     "type": "boolean",
                     "examples": [
@@ -66,13 +101,13 @@
                 "image": {
                     "type": "string",
                     "examples": [
-                        "registry.redhat.io/rhel9/postgresql-13:latest"
+                        "docker.io/postgres:13"
                     ]
                 },
                 "autogenImage": {
                     "type": "string",
                     "examples": [
-                        "registry.redhat.io/openshift4/ose-cli:latest"
+                        "docker.io/bitnami/kubectl:latest"
                     ]
                 },
                 "resources": {
@@ -138,14 +173,20 @@
                 "storage": {
                     "enabled": true,
                     "size": "2Gi",
-                    "storageClass": ""
+                    "storageClass": "",
+                    "mountPath": "/var/lib/postgresql"
                 },
                 "user": "telescope",
                 "database": "telescope",
+                "envVarKeys": {
+                    "database": "POSTGRES_DB",
+                    "user": "POSTGRES_USER",
+                    "password": "POSTGRES_PASSWORD"
+                },
                 "autogenPassword": true,
                 "port": 5432,
-                "image": "registry.redhat.io/rhel9/postgresql-13:latest",
-                "autogenImage": "registry.redhat.io/openshift4/ose-cli:latest",
+                "image": "docker.io/postgres:13",
+                "autogenImage": "docker.io/bitnami/kubectl:latest",
                 "resources": {
                     "limits": {
                         "cpu": "400m",
@@ -190,14 +231,20 @@
             "storage": {
                 "enabled": true,
                 "size": "2Gi",
-                "storageClass": ""
+                "storageClass": "",
+                "mountPath": "/var/lib/postgresql"
             },
             "user": "telescope",
             "database": "telescope",
+            "envVarKeys": {
+                "database": "POSTGRES_DB",
+                "user": "POSTGRES_USER",
+                "password": "POSTGRES_PASSWORD"
+            },
             "autogenPassword": true,
             "port": 5432,
-            "image": "registry.redhat.io/rhel9/postgresql-13:latest",
-            "autogenImage": "registry.redhat.io/openshift4/ose-cli:latest",
+            "image": "docker.io/postgres:13",
+            "autogenImage": "docker.io/bitnami/kubectl:latest",
             "resources": {
                 "limits": {
                     "cpu": "400m",

diff --git a/charts/postgresql/values.yaml b/charts/postgresql/values.yaml
@@ -7,12 +7,18 @@ postgresql:
     enabled: true
     size: 2Gi
     storageClass: ""
+    mountPath: /var/lib/postgresql
   ## Paas Required config
   # storageClass: "aws-efs-tier-c3"
   # labels:
   #   paas.redhat.com/appcode: "ASBL-001"
   user: telescope
   database: telescope
+  envVarKeys:
+    database: POSTGRES_DB
+    user: POSTGRES_USER
+    password: POSTGRES_PASSWORD
+
 ## If using external db set the host
 # host: "example.com"
 
@@ -21,8 +27,8 @@ postgresql:
 ## If using external instance supply the password
 # password: "somepassword"
   port: 5432
-  image: registry.redhat.io/rhel9/postgresql-13:latest
-  autogenImage: registry.redhat.io/openshift4/ose-cli:latest
+  image: docker.io/postgres:13
+  autogenImage: docker.io/bitnami/kubectl:latest
   resources:
     limits:
       cpu: 400m

diff --git a/charts/telescope-argocd/Chart.yaml b/charts/telescope-argocd/Chart.yaml
@@ -1,4 +1,7 @@
 apiVersion: v2
 name: telescope-argocd
 description: Chart to deploy Argo CD Applications Supporting Telescope
-version: 0.3.0
+version: 0.4.0
+home: https://project-telescope.com
+sources:
+  - https://github.com/RH-Telescope/helm-charts
diff --git a/charts/telescope-argocd/README.md b/charts/telescope-argocd/README.md
@@ -0,0 +1,31 @@
+# telescope-argocd
+
+![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square)
+
+Chart to deploy Argo CD Applications Supporting Telescope
+
+**Homepage:** <https://project-telescope.com>
+
+## Source Code
+
+* <https://github.com/RH-Telescope/helm-charts>
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| chartVersion | string | `"x"` |  |
+| charts.postgresql.enabled | bool | `true` |  |
+| charts.telescope-backend.enabled | bool | `true` |  |
+| charts.telescope-frontend.enabled | bool | `true` |  |
+| defaultSyncPolicy.automated.prune | bool | `false` |  |
+| defaultSyncPolicy.automated.selfHeal | bool | `true` |  |
+| defaultSyncPolicy.retry.backoff.duration | string | `"15s"` |  |
+| defaultSyncPolicy.retry.backoff.factor | int | `2` |  |
+| defaultSyncPolicy.retry.backoff.maxDuration | string | `"5m"` |  |
+| defaultSyncPolicy.retry.limit | int | `5` |  |
+| destinationServer | string | `"https://kubernetes.default.svc"` |  |
+| gitOpsNamespace | string | `"openshift-gitops"` |  |
+| repoURL | string | `"https://rh-telescope.github.io/helm-charts"` |  |
+
+----------------------------------------------
diff --git a/charts/telescope-argocd/templates/application.yaml b/charts/telescope-argocd/templates/application.yaml
@@ -23,6 +23,10 @@ spec:
       values: |
         {{- toYaml $chart.values | nindent 8 }}
     {{- end }}
+    {{- if $chart.valueFiles }}
+      valueFiles: |
+        {{- toYaml $chart.valueFiles | nindent 8 }}
+    {{- end }}
   syncPolicy:
     {{- toYaml (default $.Values.defaultSyncPolicy $chart.syncPolicy) | nindent 4 }}
 {{- end }}