feat: add rabbitmq to ingress and improve values.yaml

Author: PJEstrada

templates/diffgram_settings.tpl

@@ -8,7 +8,7 @@
   CLOUD_STORAGE_BUCKET:  {{ .Values.diffgramSettings.CLOUD_STORAGE_BUCKET }}
   ML__CLOUD_STORAGE_BUCKET:  {{ .Values.diffgramSettings.ML__CLOUD_STORAGE_BUCKET }}
   URL_BASE: {{ .Values.diffgramDomain }}
-  WALRUS_SERVICE_URL_BASE: {{ .Values.diffgramSettings.WALRUS_SERVICE_URL_BASE }}
+  WALRUS_SERVICE_URL_BASE: https://{{ .Values.diffgramDomain }}
   SERVICE_ACCOUNT_FULL_PATH: {{ .Values.diffgramSettings.SERVICE_ACCOUNT_FULL_PATH }}
   DIFFGRAM_AZURE_CONTAINER_NAME: {{ .Values.diffgramSettings.DIFFGRAM_AZURE_CONTAINER_NAME }}
   ML__DIFFGRAM_AZURE_CONTAINER_NAME: {{ .Values.diffgramSettings.ML__DIFFGRAM_AZURE_CONTAINER_NAME }}

templates/ingress.yaml

@@ -7,11 +7,10 @@ metadata:
     kubernetes.io/ingress.class: "nginx"
     ingressclass.kubernetes.io/is-default-class: "true"
     nginx.ingress.kubernetes.io/use-regex: "true"
-    {{ if eq .Values.useTls false}}
     nginx.ingress.kubernetes.io/enable-cors: "true"
+    {{ if eq .Values.useTls false}}
     nginx.ingress.kubernetes.io/hsts: "false"
     hsts: "false"
-
     nginx.ingress.kubernetes.io/configuration-snippet: |
       add_header Access-Control-Allow-Methods "POST, GET, PUT, PATCH, DELETE, OPTIONS";
       add_header Access-Control-Allow-Credentials true;
@@ -24,15 +23,11 @@ metadata:
       }
     {{ end }}
     {{ if eq .Values.useTls true}}
-    nginx.ingress.kubernetes.io/enable-cors: "true"
+    cert-manager.io/issuer: {{ .Values.tlsIssuer }}
     nginx.ingress.kubernetes.io/configuration-snippet: |
       proxy_pass_header directory_id;
     {{ end }}
-
     nginx.org/proxy-pass-headers: directory_id
-    {{ if eq .Values.useTls true}}
-    cert-manager.io/issuer: {{ .Values.tlsIssuer }}
-    {{ end }}
     watch-namespace: {{ .Release.Namespace }}
     # Limit uploads to 8TB
     nginx.ingress.kubernetes.io/proxy-body-size: 800000m
@@ -46,6 +41,16 @@ spec:
       secretName: diffgram-cert-tls-{{ .Values.diffgramDomain }}
   {{ end }}
   rules:
+    - host: rabbitmq.{{ .Values.diffgramDomain}}
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: diffgram-rabbitmq
+                port:
+                  number: 15672
     - host: {{ .Values.diffgramDomain }}
       http:
         paths:

templates/ingress_configmap.yaml

@@ -3,7 +3,7 @@
 # Declare variables to be passed into your templates.
 
 # The Diffgram Version. Whenever a new update arrives, this will be changed.
-diffgramVersion: DAD-244-actions-builder-v-2
+diffgramVersion: 0.16.0
 
 # Either 'opencore' or 'enterprise'. Please note that selecting 'enterprise'
 # requires that you also set imagePullCredentials.gcrCredentials.
@@ -12,7 +12,7 @@ diffgramEdition: opencore
 # Set this to your public domain where you want diffgram to be.
 # This must be a domain name and not a public IP address.
 # The chart will generate TLS certificates for the provided domain if useCertManager is 'true'
-diffgramDomain: mydiffgram1.com
+diffgramDomain: example.com
 
 # Set this to true if you want to use cert manager for TLS certificates generation.
 useCertManager: true
@@ -42,14 +42,14 @@ dbSettings:
 # All the Secrets Used in Diffgram.
 diffgramSecrets:
   STRIPE_API_KEY: none
-  DIFFGRAM_AWS_ACCESS_KEY_ID: write_your_aws_access_key
-  DIFFGRAM_AWS_ACCESS_KEY_SECRET: write_your_aws_access_key_secret
+  DIFFGRAM_AWS_ACCESS_KEY_ID: none
+  DIFFGRAM_AWS_ACCESS_KEY_SECRET: none
   _ANALYTICS_WRITE_KEY: provided_by_diffgram_team
   MAILGUN_KEY: provided_by_diffgram_team
   HUB_SPOT_KEY: provided_by_diffgram_team
   SECRET_KEY: provided_by_diffgram_team
   FERNET_KEY: NeL_RED6zZ1XF3XT7Yd1hzFPYyebrg6UdkECTOLHEdI= # Please change this for production usage
-  INTER_SERVICE_SECRET: provided_by_diffgram_team
+  INTER_SERVICE_SECRET: interservicesecret_please_replace_with_secure_value
   # Use diffgram-postgres, postgres-rds-service depending on which DB service you set on dbSettings
   USER_PASSWORDS_SECRET: provided_by_diffgram_team
   # The service account JSON for GCP Static Storage Encoded in Base64.
@@ -60,12 +60,11 @@ diffgramSecrets:
 
 diffgramSettings:
   USERDOMAIN: kubernetes
-  WALRUS_SERVICE_URL_BASE: example.com
   DIFFGRAM_SYSTEM_MODE: production
   DIFFGRAM_STATIC_STORAGE_PROVIDER: aws
-  DIFFGRAM_S3_BUCKET_NAME: none
-  DIFFGRAM_AZURE_CONTAINER_NAME: none
-  ML__DIFFGRAM_AZURE_CONTAINER_NAME: none
+  DIFFGRAM_S3_BUCKET_NAME: diffgram-testing
+  DIFFGRAM_AZURE_CONTAINER_NAME: diffgram-testing
+  ML__DIFFGRAM_AZURE_CONTAINER_NAME: diffgram-testing
   ML__DIFFGRAM_S3_BUCKET_NAME: diffgram-testing
   CLOUD_STORAGE_BUCKET: diffgram-testing
   ML__CLOUD_STORAGE_BUCKET: diffgram-testing
@@ -107,12 +106,18 @@ imagePullCredentials:
 useRabbitMq: true
 rabbitmq:
   auth:
-    rabbitmq: "diffgram"
+    username: "diffgram"
     password: "diffgram"
     tls:
       enabled: true
       autoGenerated: true
-
+  resources:
+    requests:
+      cpu: "1.0"
+      memory: "1G"
+    limits:
+      cpu: "2.0"
+      memory: "2G"
 ####### End Dependencies
 
 nodeGroupLabel: null