Rabbitmq host update to release name (#1203)

* rabbitmq host will use the releaseName pattern * update secret name * added cc username and reading credentials from littlbeats.secret.yaml --------- Co-authored-by: Dipannita Dey <[email protected]>
clowder-framework · Nov 5, 2024 · 9a41c8a · 9a41c8a
1 parent 4ea5404
commit 9a41c8a
Show file tree

Hide file tree

Showing 6 changed files with 141 additions and 7 deletions.
diff --git a/deployments/kubernetes/charts/clowder2/littlebeats.yaml b/deployments/kubernetes/charts/clowder2/littlebeats.yaml
@@ -0,0 +1,134 @@
+hostname: &hostname littlebeats.clowderframework.org
+
+ingress:
+  enabled: true
+  annotations:
+    nginx.ingress.kubernetes.io/proxy-body-size: "0"
+  tls:
+    - hosts:
+        - *hostname
+      secretName: littlebeats.clowderframework.org-tls
+
+minio:
+  auth:
+    rootUser: littlebeats
+    existingSecret: littlebeats-secret
+    rootPasswordSecretKey: root-password
+  persistence:
+    storageClass: nfs-taiga
+    size: 20Gi
+  ingress:
+    enabled: false
+  apiIngress:
+    enabled: true
+    hostname: minio-api.littlebeats.clowderframework.org
+
+rabbitmq:
+  auth:
+    username: littlebeats
+    existingPasswordSecret: littlebeats-secret
+    existingErlangSecret: littlebeats-secret
+    existingSecretPasswordKey: rabbitmq-password
+    erlangCookie: kittencookie
+  ingress:
+    enabled: false
+  persistence:
+    storageClass: csi-cinder-sc-retain
+    size: 8Gi
+
+mongodb:
+  persistence:
+    storageClass: csi-cinder-sc-retain
+    size: 8Gi
+
+elasticsearch:
+  master:
+    persistence:
+      storageClass: csi-cinder-sc-retain
+      size: 8Gi
+  data:
+    persistence:
+      storageClass: csi-cinder-sc-retain
+      size: 8Gi
+
+keycloak:
+  auth:
+    existingSecret: littlebeats-secret
+    adminUser: littlebeats
+  ingress:
+    hostname: *hostname
+    path: /keycloak
+    tls: true
+    annotations:
+      cert-manager.io/cluster-issuer: letsencrypt-prod
+      nginx.ingress.kubernetes.io/proxy-buffer-size: "128k"
+
+  postgresql:
+    auth:
+      existingSecret: littlebeats-secret
+      username: keycloak
+      database: keycloak
+    primary:
+      persistence:
+        storageClass: csi-cinder-sc-retain
+        size: 8Gi
+
+geoserver:
+  enabled: false
+
+backend:
+  existingSecret: littlebeats-secret
+  env:
+    MINIO_SERVER_URL: littlebeats-minio:9000
+    MONGODB_URL: mongodb://littlebeats-mongodb:27017
+    oauth2_scheme_auth_url: http://littlebeats-keycloak-headless:8080/keycloak/realms/clowder/protocol/openid-connect/auth?client_id=clowder2-backend&response_type=code
+    auth_register_url: /keycloak/realms/clowder/protocol/openid-connect/registrations?client_id=clowder2-backend&response_type=code&redirect_uri=$(auth_redirect_uri)&scope=openid%20email
+    auth_token_url: http://littlebeats-keycloak-headless:8080/keycloak/realms/clowder/protocol/openid-connect/token
+    elasticsearch_url: http://littlebeats-elasticsearch:9200
+    RABBITMQ_HOST: littlebeats-rabbitmq
+    API_HOST: http://littlebeats-clowder2-backend:80
+
+message:
+  existingSecret: littlebeats-secret
+  env:
+    MONGODB_URL: mongodb://littlebeats-mongodb:27017
+    RABBITMQ_HOST: littlebeats-rabbitmq
+
+heartbeat:
+  existingSecret: littlebeats-secret
+  env:
+    MONGODB_URL: mongodb://littlebeats-mongodb:27017
+    RABBITMQ_HOST: littlebeats-rabbitmq
+
+extractors:
+  littlebeats-extractor:
+    image: clowder/extractors-littlebeats:latest
+    existingSecret: littlebeats-secret
+    env:
+      - name: USERNAME
+        value: ccp-littlebeats
+      - name: PASSWORD
+        valueFrom:
+          secretKeyRef:
+            name: littlebeats-secret
+            key: extractor-password
+
+frontend:
+  image:
+    repository: clowder/clowder2-frontend
+    tag: 2.0.0-beta.2
+
+backend:
+  image:
+    repository: clowder/clowder2-backend
+    tag: 2.0.0-beta.2
+
+message:
+  image:
+    repository: clowder/clowder2-messages
+    tag: 2.0.0-beta.2
+
+heartbeat:
+  image:
+    repository: clowder/clowder2-heartbeat
+    tag: 2.0.0-beta.2
diff --git a/deployments/kubernetes/charts/clowder2/templates/backend/deployment.yaml b/deployments/kubernetes/charts/clowder2/templates/backend/deployment.yaml
@@ -57,7 +57,7 @@ spec:
               {{- else }}
               valueFrom:
                 secretKeyRef:
-                  name: {{ include "clowder2.fullname" . }}-minio
+                  name: {{include "clowder2.releaseName" . }}-secret
                   key: root-password
               {{- end }}
             - name: MINIO_UPLOAD_CHUNK_SIZE
@@ -107,7 +107,7 @@ spec:
               {{- else }}
               valueFrom:
                 secretKeyRef:
-                  name: {{ include "clowder2.fullname" . }}-rabbitmq
+                  name: {{ include "clowder2.releaseName" . }}-secret
                   key: rabbitmq-password
               {{- end }}
             - name: RABBITMQ_HOST

diff --git a/deployments/kubernetes/charts/clowder2/templates/extractors/deployment.yaml b/deployments/kubernetes/charts/clowder2/templates/extractors/deployment.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.extractors }}
 {{- $fullname := include "clowder2.fullname" . }}
-{{- $name := include "clowder2.name" . }}
+{{- $name := include "clowder2.releaseName" . }}
 {{- $labels := include "clowder2.labels" . }}
 {{- range $key, $val := .Values.extractors }}
 {{- if or .enabled (not (hasKey . "enabled")) }}
@@ -46,7 +46,7 @@ spec:
               {{- else }}
               valueFrom:
                 secretKeyRef:
-                  name: {{ $fullname }}-rabbitmq
+                  name: {{ $name }}-secret
                   key: rabbitmq-password
               {{- end }}
             - name: CLOWDER_VERSION

diff --git a/deployments/kubernetes/charts/clowder2/templates/geoserver/deployment.yaml b/deployments/kubernetes/charts/clowder2/templates/geoserver/deployment.yaml
@@ -39,7 +39,7 @@ spec:
               {{- else }}
               valueFrom:
                 secretKeyRef:
-                  name: {{include "clowder2.fullname" . }}-services
+                  name: {{include "clowder2.releaseName" . }}-secret
                   key: GEOSERVER_PW
               {{- end }}
           ports:

diff --git a/deployments/kubernetes/charts/clowder2/templates/heartbeat/deployment.yaml b/deployments/kubernetes/charts/clowder2/templates/heartbeat/deployment.yaml
@@ -46,7 +46,7 @@ spec:
               {{- else }}
               valueFrom:
                 secretKeyRef:
-                  name: {{include "clowder2.fullname" . }}-rabbitmq
+                  name: {{include "clowder2.releaseName" . }}-secret
                   key: rabbitmq-password
               {{- end }}
             - name: RABBITMQ_HOST

diff --git a/deployments/kubernetes/charts/clowder2/templates/messages/deployment.yaml b/deployments/kubernetes/charts/clowder2/templates/messages/deployment.yaml
@@ -46,7 +46,7 @@ spec:
               {{- else }}
               valueFrom:
                 secretKeyRef:
-                  name: {{ include "clowder2.fullname" . }}-rabbitmq
+                  name: {{ include "clowder2.releaseName" . }}-secret
                   key: rabbitmq-password
               {{- end }}
             - name: RABBITMQ_HOST