Merge branch 'master' into helm-chart-service-annotations

joeferner · Oct 10, 2023 · cf6178a · cf6178a
2 parents 225e67d + 582cddd
commit cf6178a
Show file tree

Hide file tree

Showing 11 changed files with 1,018 additions and 688 deletions.
diff --git a/.github/workflows/chart-test.yml b/.github/workflows/chart-test.yml
@@ -30,7 +30,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up Helm
@@ -50,7 +50,7 @@ jobs:
     needs: lint-chart
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Run helm-docs
@@ -83,7 +83,7 @@ jobs:
             legacy_ingress: true
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up Helm
@@ -127,7 +127,7 @@ jobs:
 #          - v1.25.2
 #    steps:
 #      - name: Checkout
-#        uses: actions/checkout@v3
+#        uses: actions/checkout@v4
 #      - name: Create kind ${{ matrix.k8s }} cluster
 #        uses: helm/kind-action@master
 #        with:

diff --git a/.github/workflows/dependency-checks.yml b/.github/workflows/dependency-checks.yml
@@ -9,6 +9,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout Repository'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: 'Dependency Review'
         uses: actions/dependency-review-action@v3
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -51,17 +51,17 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up QEMU for Buildx
         id: qemu
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
         with:
           platforms: all
 
       - name: Install Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
         with:
           version: latest
           install: true
@@ -70,13 +70,13 @@ jobs:
       # and dockerhub without explicit name
       # =============
       #- name: Log in to Dockerhub
-      #  uses: docker/login-action@v2
+      #  uses: docker/login-action@v3
       #  with:
       #    username: "${{secrets.DOCKER_USERNAME}}"
       #    password: "${{secrets.DOCKER_PASSWORD}}"
 
       - name: Log in to Github Container registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: "${{ env.GITHUB_REG }}"
           username: "${{ github.actor }}"
@@ -114,7 +114,7 @@ jobs:
           echo "Image tags:  ${{ steps.prep.outputs.tags }}"
 
       - name: Docker build and push to GHCR and Dockerhub for prepared tags
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: .

diff --git a/k8s/helm-chart/example-manifest.yaml b/k8s/helm-chart/example-manifest.yaml
@@ -0,0 +1,101 @@
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
+kind: HelmRelease
+metadata:
+  name: redis-commander
+spec:
+  releaseName: redis-commander
+  values:
+    image:
+      repository: ghcr.io/joeferner/redis-commander
+      tag: latest
+    connections:
+      local_production_json: >-
+        {
+          "noSave": false,
+          "noLogData": false,
+          "ui": {
+            "sidebarWidth": 250,
+            "locked": false,
+            "cliHeight": 320,
+            "cliOpen": false,
+            "foldingChar": ":",
+            "jsonViewAsDefault": "none",
+            "binaryAsHex": true,
+            "maxHashFieldSize": 0
+          },
+          "redis": {
+            "readOnly": false,
+            "flushOnImport": false,
+            "useScan": true,
+            "scanCount": 100,
+            "rootPattern": "*",
+            "connectionName": "redis-commander",
+            "defaultLabel": "local",
+            "defaultSentinelGroup": "mymaster"
+          },
+          "server": {
+            "address": "0.0.0.0",
+            "port": 8081,
+            "urlPrefix": "",
+            "signinPath": "signin",
+            "httpAuthHeaderName": "Authorization",
+            "trustProxy": false,
+            "clientMaxBodySize": "100kb",
+            "httpAuth": {
+              "username": "",
+              "password": "",
+              "passwordHash": "",
+              "comment": "to enable http auth set username and either password or passwordHash",
+              "jwtSecret": ""
+            }
+          },
+          "sso": {
+            "enabled": false,
+            "jwtSharedSecret": "",
+            "jwtAlgorithms": ["HS256", "HS384", "HS512"],
+            "allowedIssuer": "",
+            "audience": "",
+            "subject": ""
+          },
+          "connections": [
+            {
+              "label": "redis-sentinel-service-x",
+              "sentinels": "19.94.12.11:26379",
+              "sentinelName": "mymaster",
+              "dbIndex": 0
+            },
+            {
+              "label": "redis-sentinel-service-y",
+              "sentinels": "19.94.12.11:26379",
+              "sentinelName": "mymaster",
+              "dbIndex": 0
+            },
+            {
+              "label": "redis-server-service-xz",
+              "host": "19.94.12.11",
+              "port": "6379",
+              "dbIndex": 0
+            },
+            {
+              "label": "redis-server-service-yz",
+              "host": "19.94.12.11",
+              "port": "6379",
+              "dbIndex": 0
+            }
+          ]
+        }
+    volumeMounts:
+      - name: local-production
+        mountPath: /redis-commander/config
+    volumes:
+        - name: local-production
+          configMap:
+            name: redis-commander-configmap
+  rollback:
+    disableWait: true
+    cleanupOnFail: true
+  upgrade:
+    cleanupOnFail: true
+    remediation:
+      retries: 3
+  maxHistory: 5
diff --git a/k8s/helm-chart/redis-commander/templates/configmap.yaml b/k8s/helm-chart/redis-commander/templates/configmap.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Release.Name }}-configmap
+data:
+  local-production.json: {{ .Values.connections.local_production_json | toJson }}
diff --git a/k8s/helm-chart/redis-commander/templates/deployment.yaml b/k8s/helm-chart/redis-commander/templates/deployment.yaml
@@ -76,6 +76,10 @@ spec:
           {{- end }}
           - name: K8S_SIGTERM
             value: "1"
+          {{- with .Values.volumeMounts }}
+          volumeMounts:
+            {{- toYaml . | default "" | nindent 12 }}
+          {{- end }}
           livenessProbe:
             httpGet:
               path: /favicon.png
@@ -84,6 +88,10 @@ spec:
             timeoutSeconds: 5
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+      {{- with .Values.volumes }}
+      volumes:
+        {{- toYaml . | default "" | nindent 8 }}
+      {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

diff --git a/k8s/helm-chart/redis-commander/values.schema.json b/k8s/helm-chart/redis-commander/values.schema.json
@@ -189,6 +189,15 @@
         },
         "tolerations": {
             "type": "array"
+        },
+        "connections": {
+        "type": "object"
+        },
+        "volumeMounts": {
+        "type": "array"
+        },
+        "volumes": {
+        "type": "array"
         }
     }
 }
diff --git a/k8s/helm-chart/redis-commander/values.yaml b/k8s/helm-chart/redis-commander/values.yaml
@@ -148,3 +148,9 @@ nodeSelector: {}
 tolerations: []
 
 affinity: {}
+
+connections: {}
+
+volumeMounts: []
+
+volumes: []