add support in active active mode

aquasecurity · May 14, 2020 · ce60ce8 · ce60ce8
1 parent bce6482
commit ce60ce8
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 55 deletions.
diff --git a/server/templates/db-password-secret.yaml b/server/templates/db-password-secret.yaml
@@ -17,22 +17,6 @@ metadata:
 type: Opaque
 data:
   db-password: {{ .Values.db.external.password | b64enc | quote }}
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ .Release.Name }}-database-audit-password
-  labels:
-    app: {{ .Release.Name }}-database
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-  annotations:
-    "helm.sh/hook": pre-install
-    "helm.sh/hook-delete-policy": before-hook-creation
-type: Opaque
-data:
-  db-audit-password: {{ .Values.db.external.auditPassword | b64enc | quote }}
 {{- else }}
 ---
 apiVersion: v1

diff --git a/server/templates/gate-deployment.yaml b/server/templates/gate-deployment.yaml
@@ -61,43 +61,60 @@ spec:
         - name: SCALOCK_DBPORT
           value: {{ .Values.db.external.enabled | ternary .Values.db.external.port "5432" | quote }}
         - name: SCALOCK_AUDIT_DBUSER
-          value: {{ .Values.db.external.enabled | ternary .Values.db.external.auditUser "postgres" }}
+          value: {{ .Values.db.external.enabled | ternary .Values.db.external.user "postgres" }}
           {{- if .Values.db.passwordSecret }}
         - name: SCALOCK_AUDIT_DBPASSWORD
           valueFrom:
             secretKeyRef:
-              name: {{ .Values.db.dbAuditPasswordName }}
-              key: {{ .Values.db.dbAuditPasswordKey }}
-          {{- else }}
-          {{- if .Values.db.external.enabled }}
-        - name: SCALOCK_AUDIT_DBPASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ .Release.Name }}-database-audit-password
-              key: db-audit-password
+              name: {{ .Values.db.dbPasswordName }}
+              key: {{ .Values.db.dbPasswordKey }}
           {{- else }}
         - name: SCALOCK_AUDIT_DBPASSWORD
           valueFrom:
             secretKeyRef:
               name: {{ .Release.Name }}-database-password
-              key: db-password 
-          {{- end }}
+              key: db-password
           {{- end }}
         - name: SCALOCK_AUDIT_DBNAME
           value: {{ .Values.db.external.enabled | ternary .Values.db.external.auditName "slk_audit" }}
         - name: SCALOCK_AUDIT_DBHOST
           {{- if .Values.db.external.enabled }}
-          value: {{ .Values.db.external.auditHost }}
+          value: {{ .Values.db.external.host }}
           {{- else }}
           value: {{ .Release.Name }}-database-svc
           {{- end }}
         - name: SCALOCK_AUDIT_DBPORT
-          value: {{ .Values.db.external.enabled | ternary .Values.db.external.auditPort "5432" | quote }}
+          value: {{ .Values.db.external.enabled | ternary .Values.db.external.port "5432" | quote }}
+        {{- if .Values.activeactive }}
+        - name: AQUA_PUBSUB_DBUSER
+          value: {{ .Values.db.external.enabled | ternary .Values.db.external.user "postgres" }}
+          {{- if .Values.db.passwordSecret }}
+        - name: AQUA_PUBSUB_DBPASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.db.dbPasswordName }}
+              key: {{ .Values.db.dbPasswordKey }}
+          {{- else }}
+        - name: AQUA_PUBSUB_DBPASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Release.Name }}-database-password
+              key: db-password
+          {{- end }}
+        - name: AQUA_PUBSUB_DBNAME
+          value: {{ .Values.db.external.enabled | ternary .Values.db.external.pubsubName "aqua_pubsub" }}
+        - name: AQUA_PUBSUB_DBHOST
+          {{- if .Values.db.external.enabled }}
+          value: {{ .Values.db.external.host }}
+          {{- else }}
+          value: {{ .Release.Name }}-database-svc
+          {{- end }}
+        - name: AQUA_PUBSUB_DBPORT
+          value: {{ .Values.db.external.enabled | ternary .Values.db.external.port "5432" | quote }}
+          {{- end }}
           {{- if .Values.db.ssl }}
         - name: SCALOCK_DBSSL
           value: require
-          {{- end }}
-          {{- if .Values.db.auditssl }}
         - name: SCALOCK_AUDIT_DBSSL
           value: require
           {{- end }}

diff --git a/server/templates/web-deployment.yaml b/server/templates/web-deployment.yaml
@@ -55,38 +55,57 @@ spec:
         - name: SCALOCK_DBPORT
           value: {{ .Values.db.external.enabled | ternary .Values.db.external.port "5432" | quote }}
         - name: SCALOCK_AUDIT_DBUSER
-          value: {{ .Values.db.external.enabled | ternary .Values.db.external.auditUser "postgres" }}
+          value: {{ .Values.db.external.enabled | ternary .Values.db.external.user "postgres" }}
           {{- if .Values.db.passwordSecret }}
         - name: SCALOCK_AUDIT_DBPASSWORD
           valueFrom:
             secretKeyRef:
-              name: {{ .Values.db.dbAuditPasswordName }}
-              key: {{ .Values.db.dbAuditPasswordKey }}
-          {{- else }}
-          {{- if .Values.db.external.enabled }}
-        - name: SCALOCK_AUDIT_DBPASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ .Release.Name }}-database-audit-password
-              key: db-audit-password
+              name: {{ .Values.db.dbPasswordName }}
+              key: {{ .Values.db.dbPasswordKey }}
           {{- else }}
         - name: SCALOCK_AUDIT_DBPASSWORD
           valueFrom:
             secretKeyRef:
               name: {{ .Release.Name }}-database-password
-              key: db-password 
-          {{- end }}
+              key: db-password
           {{- end }}
         - name: SCALOCK_AUDIT_DBNAME
           value: {{ .Values.db.external.enabled | ternary .Values.db.external.auditName "slk_audit" }}
         - name: SCALOCK_AUDIT_DBHOST
           {{- if .Values.db.external.enabled }}
-          value: {{ .Values.db.external.auditHost }}
+          value: {{ .Values.db.external.host }}
           {{- else }}
           value: {{ .Release.Name }}-database-svc
           {{- end }}
         - name: SCALOCK_AUDIT_DBPORT
-          value: {{ .Values.db.external.enabled | ternary .Values.db.external.auditPort "5432" | quote }}
+          value: {{ .Values.db.external.enabled | ternary .Values.db.external.port "5432" | quote }}
+          {{- if .Values.activeactive }}
+        - name: AQUA_PUBSUB_DBUSER
+          value: {{ .Values.db.external.enabled | ternary .Values.db.external.user "postgres" }}
+          {{- if .Values.db.passwordSecret }}
+        - name: AQUA_PUBSUB_DBPASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.db.dbPasswordName }}
+              key: {{ .Values.db.dbPasswordKey }}
+          {{- else }}
+        - name: AQUA_PUBSUB_DBPASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Release.Name }}-database-password
+              key: db-password
+          {{- end }}
+        - name: AQUA_PUBSUB_DBNAME
+          value: {{ .Values.db.external.enabled | ternary .Values.db.external.pubsubName "aqua_pubsub" }}
+        - name: AQUA_PUBSUB_DBHOST
+          {{- if .Values.db.external.enabled }}
+          value: {{ .Values.db.external.host }}
+          {{- else }}
+          value: {{ .Release.Name }}-database-svc
+          {{- end }}
+        - name: AQUA_PUBSUB_DBPORT
+          value: {{ .Values.db.external.enabled | ternary .Values.db.external.port "5432" | quote }}
+          {{- end }}
           {{- if .Values.admin.secretname }}
         - name: LICENSE_TOKEN
           valueFrom:
@@ -120,8 +139,6 @@ spec:
           {{- if .Values.db.ssl }}
         - name: SCALOCK_DBSSL
           value: require
-          {{- end }}
-          {{- if .Values.db.auditssl }}
         - name: SCALOCK_AUDIT_DBSSL
           value: require
           {{- end }}
@@ -151,6 +168,10 @@ spec:
         - name: CLUSTER_MODE
           value: "enable"  
           {{- end }}
+          {{- if .Values.activeactive }}
+        - name: AQUA_CLUSTER_MODE
+          value: "active-active"  
+          {{- end }}
           {{- if .Values.web.proxy.httpProxy }}
         - name: http_proxy
           value: {{ .Values.web.proxy.httpProxy }}

diff --git a/server/values.yaml b/server/values.yaml
@@ -12,7 +12,9 @@ rbac:
   privileged: true
   roleRef:
 
+# enable only one of the modes
 clustermode: false
+activeactive: true
 
 admin:
   token:
@@ -36,17 +38,11 @@ db:
     user:
     password:
     auditName:
-    auditHost:
-    auditPort:
-    auditUser:
-    auditPassword:
+    pubsubName:
   passwordSecret: null
   dbPasswordName: null
   dbPasswordKey: null
-  dbAuditPasswordName: null
-  dbAuditPasswordKey: null
   ssl: false
-  auditssl: false
   image:
     repository: database
     tag: "4.6"