Merge pull request #182 from mlbiam/master

fixes for amq ha and new namespace
OpenUnison · Oct 31, 2024 · 558556b · 558556b
2 parents eb5daa4 + 13e529b
commit 558556b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/openunison-k8s-cluster-management/Chart.yaml b/openunison-k8s-cluster-management/Chart.yaml
@@ -14,7 +14,7 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 3.0.40
+version: 3.0.41
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.

diff --git a/openunison-k8s-cluster-management/templates/workflows/new-k8s-namespace.yaml b/openunison-k8s-cluster-management/templates/workflows/new-k8s-namespace.yaml
@@ -67,20 +67,21 @@ spec:
                - sn
                - mail
 
-           {{ if not .Values.openunison.naas.groups.external.enabled }}
+
+
+           {{ if .Values.openunison.naas.groups.internal.enabled }}
            - taskType: addAttribute
              name: enableInternal
              value: enabled
              addToRequest: true
            {{ else }}
-           {{ if not .Values.openunison.naas.groups.internal.enabled }}
            - taskType: addAttribute
              name: enableInternal
              value: disabled
              addToRequest: true
            {{ end }}
-           {{ end }}
-
+
+           
            - taskType: customTask
              className: com.tremolosecurity.provisioning.customTasks.PrintUserInfo
              params:

diff --git a/orchestra/Chart.yaml b/orchestra/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.10.60
+version: 2.10.61
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/orchestra/templates/infrastructure/activemq-config-pvc.yaml b/orchestra/templates/infrastructure/activemq-config-pvc.yaml
@@ -375,6 +375,8 @@ kind: PersistentVolumeClaim
 metadata:
   name: activemq-kahadb
   namespace: {{ .Release.Namespace }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "25"
 spec:
   {{ if .Values.openunison.activemq_storageclass }}
   storageClassName: {{ .Values.openunison.activemq_storageclass }}