Update halfshot/matrix-hookshot Docker tag to v5.3.0 (#38)

* Update halfshot/matrix-hookshot Docker tag to v5.3.0

* update chart

* fix linting errors

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: alexlebens <alexanderlebens@gmail.com>

charts/homepage/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: homepage
-version: 0.0.10
+version: 0.0.11
 description: Chart for benphelps homepage
 keywords:
   - dashboard
@@ -9,4 +9,4 @@ sources:
 maintainers:
   - name: alexlebens
 icon: https://github.com/benphelps/homepage/blob/de584eae8f12a0d257e554e9511ef19bd2a1232c/public/mstile-150x150.png
-appVersion: v0.8.11
+appVersion: v0.8.12

charts/homepage/values.yaml

@@ -3,7 +3,7 @@ deployment:
   strategy: Recreate
   image:
     repository: ghcr.io/gethomepage/homepage
-    tag: v0.8.11
+    tag: v0.8.12
     imagePullPolicy: IfNotPresent
   env:
   envFrom:

charts/matrix-hookshot/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: matrix-hookshot
-version: 0.1.0
+version: 0.1.1
 description: Chart for Matrix Hookshot
 keywords:
   - matrix
@@ -11,4 +11,4 @@ sources:
 maintainers:
   - name: alexlebens
 icon: https://avatars.githubusercontent.com/u/8418310?s=48&v=4
-appVersion: "5.2.1"
+appVersion: "5.3.0"

charts/matrix-hookshot/values.yaml

@@ -3,7 +3,7 @@ deployment:
   strategy: Recreate
   image:
     repository: halfshot/matrix-hookshot
-    tag: "5.2.1"
+    tag: "5.3.0"
     imagePullPolicy: IfNotPresent
   env: {}
   envFrom: []
@@ -39,7 +39,7 @@ ingress:
     enabled: false
     className: ""
     annotations: {}
-    host: ""    
+    host: ""
 metrics:
   enabled: false
   serviceMonitor:
@@ -81,7 +81,7 @@ hookshot:
         resources:
           - widgets
 
-    #github:
+    # github:
     #  # (Optional) Configure this to enable GitHub support
     #  auth:
     #    # Authentication for the GitHub App.
@@ -104,7 +104,7 @@ hookshot:
     #    # (Optional) Prefix used when creating ghost users for GitHub accounts.
     #    _github_
 
-    #gitlab:
+    # gitlab:
     #  # (Optional) Configure this to enable GitLab support
     #  instances:
     #    gitlab.com:
@@ -119,7 +119,7 @@ hookshot:
     #    # (Optional) Aggregate comments by waiting this many miliseconds before posting them to Matrix. Defaults to 5000 (5 seconds)
     #    5000
 
-    #figma:
+    # figma:
     #  # (Optional) Configure this to enable Figma support
     #  publicUrl: https://example.com/hookshot/
     #  instances:
@@ -128,7 +128,7 @@ hookshot:
     #      accessToken: your-personal-access-token
     #      passcode: your-webhook-passcode
 
-    #jira:
+    # jira:
     #  # (Optional) Configure this to enable Jira support. Only specify `url` if you are using a On Premise install (i.e. not atlassian.com)
     #  webhook:
     #    # Webhook settings for JIRA
@@ -139,7 +139,7 @@ hookshot:
     #    client_secret: bar
     #    redirect_uri: https://example.com/oauth/
 
-    #generic:
+    # generic:
     #  # (Optional) Support for generic webhook events.
     #  #'allowJsTransformationFunctions' will allow users to write short transformation snippets in code, and thus is unsafe in untrusted environments
 
@@ -150,23 +150,23 @@ hookshot:
     #  allowJsTransformationFunctions: false
     #  waitForComplete: false
 
-    #feeds:
+    # feeds:
     #  # (Optional) Configure this to enable RSS/Atom feed support
     #  enabled: false
     #  pollConcurrency: 4
     #  pollIntervalSeconds: 600
     #  pollTimeoutSeconds: 30
 
-    #provisioning:
+    # provisioning:
     #  # (Optional) Provisioning API for integration managers
     #  secret: "!secretToken"
 
-    #bot:
+    # bot:
     #  # (Optional) Define profile information for the bot user
     #  displayname: Hookshot Bot
     #  avatar: mxc://half-shot.uk/2876e89ccade4cb615e210c458e2a7a6883fe17d
 
-    #serviceBots:
+    # serviceBots:
     #  # (Optional) Define additional bot users for specific services
     #  - localpart: feeds
     #    displayname: Feeds
@@ -174,21 +174,21 @@ hookshot:
     #    prefix: "!feeds"
     #    service: feeds
 
-    #metrics:
+    # metrics:
     #  # (Optional) Prometheus metrics support
     #  enabled: true
 
-    #cache:
+    # cache:
     #  # (Optional) Cache options for large scale deployments.
     #  # For encryption to work, this must be configured.
     #  redisUri: redis://localhost:6379
 
-    #queue:
+    # queue:
     #  # (Optional) Message queue configuration options for large scale deployments.
     #  # For encryption to work, this must not be configured.
     #  redisUri: redis://localhost:6379
 
-    #widgets:
+    # widgets:
     #  # (Optional) EXPERIMENTAL support for complimentary widgets
     #  addToAdminRooms: false
     #  disallowedIpRanges:
@@ -217,12 +217,12 @@ hookshot:
     #  branding:
     #    widgetTitle: Hookshot Configuration
 
-    #sentry:
+    # sentry:
     #  # (Optional) Configure Sentry error reporting
     #  dsn: https://examplePublicKey@o0.ingest.sentry.io/0
     #  environment: production
 
-    #permissions:
+    # permissions:
     #  # (Optional) Permissions for using the bridge. See docs/setup.md#permissions for help
     #  - actor: example.com
     #    services:

charts/taiga/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: taiga
-version: 0.1.2
+version: 0.1.14
 description: Chart for Taiga
 keywords:
   - kanban
@@ -16,9 +16,9 @@ dependencies:
   - name: rabbitmq
     version: 13.0.3
     repository: https://charts.bitnami.com/bitnami
-    alias: taiga-async-rabbitmq
+    alias: async-rabbitmq
   - name: rabbitmq
     version: 13.0.3
     repository: https://charts.bitnami.com/bitnami
-    alias: taiga-events-rabbitmq
+    alias: events-rabbitmq
 appVersion: 6.7.7

charts/taiga/templates/deployment-back.yaml

@@ -213,7 +213,7 @@ spec:
               value: "False"
           {{ end }}
 
-          {{ if .Values.trelloImporter }}
+          {{ if .Values.trelloImporter.enabled }}
             - name: ENABLE_TRELLO_IMPORTER
               value: "True"
             - name: TRELLO_IMPORTER_API_KEY
@@ -232,12 +232,12 @@ spec:
           {{ end }}
 
             - name: RABBITMQ_USER
-              value: "{{ index .Values "taiga-async-rabbitmq" "auth" "username" }}"
+              value: "{{ index .Values "async-rabbitmq" "auth" "username" }}"
             - name: RABBITMQ_PASS
               valueFrom:
                 secretKeyRef:
-                  name: {{ index .Values "taiga-async-rabbitmq" "auth" "existingPasswordSecret" }}
+                  name: {{ index .Values "async-rabbitmq" "auth" "existingPasswordSecret" }}
-                  key: {{ index .Values "taiga-async-rabbitmq" "auth" "existingSecretPasswordKey" }}
+                  key: {{ index .Values "async-rabbitmq" "auth" "existingSecretPasswordKey" }}
 
           {{ if .Values.ingress.enabled }}
             - name: TAIGA_SITES_DOMAIN
@@ -437,7 +437,7 @@ spec:
               value: "False"
           {{ end }}
 
-          {{ if .Values.trelloImporter }}
+          {{ if .Values.trelloImporter.enabled }}
             - name: ENABLE_TRELLO_IMPORTER
               value: "True"
             - name: TRELLO_IMPORTER_API_KEY
@@ -456,12 +456,12 @@ spec:
           {{ end }}
 
             - name: RABBITMQ_USER
-              value: "{{ index .Values "taiga-async-rabbitmq" "auth" "username" }}"
+              value: "{{ index .Values "async-rabbitmq" "auth" "username" }}"
             - name: RABBITMQ_PASS
               valueFrom:
                 secretKeyRef:
-                  name: {{ index .Values "taiga-async-rabbitmq" "auth" "existingPasswordSecret" }}
+                  name: {{ index .Values "async-rabbitmq" "auth" "existingPasswordSecret" }}
-                  key: {{ index .Values "taiga-async-rabbitmq" "auth" "existingSecretPasswordKey" }}
+                  key: {{ index .Values "async-rabbitmq" "auth" "existingSecretPasswordKey" }}
 
           {{ if .Values.ingress.enabled }}
             - name: TAIGA_SITES_DOMAIN

charts/taiga/templates/deployment-events.yaml

@@ -46,8 +46,8 @@ spec:
       securityContext:
         {{- with .Values.events.securityContext }}
         {{ toYaml . | nindent 8 }}
-        {{- end }}
+      {{- end }}
-        containers:
+      containers:
         - name: {{ template "taiga.fullname" . }}-events
           image: "{{ .Values.events.image.repository }}:{{ .Values.events.image.tag }}"
           imagePullPolicy: {{ .Values.events.image.pullPolicy }}
@@ -55,7 +55,10 @@ spec:
             {{ toYaml .Values.events.resources | nindent 12 }}
           ports:
             - name: taiga-events
-              containerPort: {{ .Values.events.service.port }}
+              containerPort: {{ .Values.events.service.http.port }}
+              protocol: TCP
+            - name: taiga-app
+              containerPort: {{ .Values.events.service.app.port }}
               protocol: TCP
           env:
             - name: TAIGA_SECRET_KEY
@@ -64,18 +67,20 @@ spec:
                   name: "{{ .Values.secretKey.existingSecretName }}"
                   key: "{{ .Values.secretKey.existingSecretKey }}"
             - name: RABBITMQ_USER
-              value: "{{ index .Values "taiga-events-rabbitmq" "auth" "username" }}"
+              value: "{{ index .Values "events-rabbitmq" "auth" "username" }}"
             - name: RABBITMQ_PASS
               valueFrom:
                 secretKeyRef:
-                  name: {{ index .Values "taiga-events-rabbitmq" "auth" "existingPasswordSecret" }}
+                  name: {{ index .Values "events-rabbitmq" "auth" "existingPasswordSecret" }}
-                  key: {{ index .Values "taiga-events-rabbitmq" "auth" "existingSecretPasswordKey" }}
+                  key: {{ index .Values "events-rabbitmq" "auth" "existingSecretPasswordKey" }}
+            - name: APP_PORT
+              value: "{{ .Values.events.service.app.port }}"
 
           {{- if .Values.events.livenessProbe.enabled }}
           livenessProbe:
             httpGet:
-              path: /admin/login/
+              path: /healthz
-              port: {{ .Values.events.service.port }}
+              port: {{ .Values.events.service.app.port }}
             initialDelaySeconds: {{ .Values.events.livenessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.events.livenessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.events.livenessProbe.timeoutSeconds }}
@@ -86,8 +91,8 @@ spec:
           {{- if .Values.events.readinessProbe.enabled }}
           readinessProbe:
             httpGet:
-              path: /admin/login/
+              path: /healthz
-              port: {{ .Values.events.service.port }}
+              port: {{ .Values.events.service.app.port }}
             initialDelaySeconds: {{ .Values.events.readinessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.events.readinessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.events.readinessProbe.timeoutSeconds }}

charts/taiga/templates/deployment-front.yaml

@@ -72,6 +72,8 @@ spec:
               value: "false"
             - name: ENABLE_GITLAB_AUTH
               value: "false"
+            - name: ENABLE_OIDC
+              value: "{{ .Values.oidc.enabled }}"              
             - name: ENABLE_SLACK
               value: "{{ .Values.enableSlack }}"
             - name: ENABLE_GITHUB_IMPORTER

charts/taiga/templates/ingress.yaml

@@ -40,7 +40,7 @@ spec:
                 name: "{{ template "taiga.fullname" . }}-back"
                 port:
                   name: taiga-back
-            pathType: ImplementationSpecific
+            pathType: ImplementationSpecific     
           - path: /admin
             backend:
               service:
@@ -48,6 +48,15 @@ spec:
                 port:
                   name: taiga-back
             pathType: ImplementationSpecific
+        {{ if .Values.oidc.enabled }}
+          - path: /oidc
+            backend:
+              service:
+                name: "{{ template "taiga.fullname" . }}-back"
+                port:
+                  name: taiga-back
+            pathType: ImplementationSpecific
+        {{- end }}                  
           - path: /events
             backend:
               service:

charts/taiga/templates/service.yaml

@@ -55,10 +55,14 @@ metadata:
 spec:
   type: {{ .Values.events.service.type }}
   ports:
-    - port: {{ .Values.events.service.port }}
+    - port: {{ .Values.events.service.http.port }}
       targetPort: taiga-events
       protocol: TCP
       name: taiga-events
+    - port: {{ .Values.events.service.app.port }}
+      targetPort: taiga-app
+      protocol: TCP
+      name: taiga-app
   selector:
     {{- include "taiga.events.matchLabels" . | nindent 4 }}
     {{- with .Values.events.service.extraSelectorLabels }}

charts/taiga/values.yaml

@@ -347,7 +347,7 @@ async:
 ## Async Rabbitmq
 ## https://artifacthub.io/packages/helm/bitnami/rabbitmq?modal=values-schema
 ##
-taiga-async-rabbitmq:
+async-rabbitmq:
   auth:
     ## @param auth.username RabbitMQ application username
     ## ref: https://github.com/bitnami/containers/tree/main/bitnami/rabbitmq#environment-variables
@@ -487,13 +487,18 @@ events:
     # -- Allow adding additional match labels
     extraSelectorLabels: {}
 
-    # -- HTTP port number
+    http:
-    port: 8888
+      # -- HTTP port number
+      port: 8888
+
+    app:
+      # -- HTTP port number
+      port: 3023
 
 ## Events Rabbitmq
 ## https://artifacthub.io/packages/helm/bitnami/rabbitmq?modal=values-schema
 ##
-taiga-events-rabbitmq:
+events-rabbitmq:
   auth:
     ## @param auth.username RabbitMQ application username
     ## ref: https://github.com/bitnami/containers/tree/main/bitnami/rabbitmq#environment-variables