Merge pull request #132 from openinfradev/develop

1023 develop -> release ( v3.1.0 )
openinfradev · Oct 23, 2023 · 0131084 · 0131084
2 parents a68364d + 6e7f76a
commit 0131084
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/templates/argo-cd/create-app-wftpl.yaml b/templates/argo-cd/create-app-wftpl.yaml
@@ -64,9 +64,9 @@ spec:
 
         # For crds-only app, set sync-option to 'replace'
         if [[ $ARGOCD_APP_NAME == *crds ]]; then
-          ./argocd app set $ARGOCD_APP_NAME --sync-policy automated --auto-prune --sync-option Replace=true
+          ./argocd app set $ARGOCD_APP_NAME --sync-policy automated --auto-prune --sync-option CreateNamespace=true --sync-option Replace=true
         else
-          ./argocd app set $ARGOCD_APP_NAME --sync-policy automated --auto-prune
+          ./argocd app set $ARGOCD_APP_NAME --sync-policy automated --auto-prune --sync-option CreateNamespace=true
         fi
         ./argocd app sync $ARGOCD_APP_NAME --async
         ./argocd app wait $ARGOCD_APP_NAME --health

diff --git a/templates/argo-cd/prepare-argocd-wftpl.yaml b/templates/argo-cd/prepare-argocd-wftpl.yaml
@@ -67,11 +67,6 @@ spec:
             ./argocd proj create service-mesh --dest "*,*" --src "*" --allow-cluster-resource "*/*"
           fi
 
-          ./argocd proj get openstack
-          if [[ $? != 0 ]]; then
-            ./argocd proj create openstack --dest "*,*" --src "*" --allow-cluster-resource "*/*"
-          fi
-
           ./argocd proj get sealed-secrets
           if [[ $? != 0 ]]; then
             ./argocd proj create sealed-secrets --dest "*,*" --src "*" --allow-cluster-resource "*/*"
@@ -82,9 +77,9 @@ spec:
             ./argocd proj create tks-cluster --dest "*,*" --src "*" --allow-cluster-resource "*/*"
           fi
 
-          ./argocd proj get admin-tools
+          ./argocd proj get tks-admin-tools
           if [[ $? != 0 ]]; then
-            ./argocd proj create admin-tools --dest "*,*" --src "*" --allow-cluster-resource "*/*"
+            ./argocd proj create tks-admin-tools --dest "*,*" --src "*" --allow-cluster-resource "*/*"
           fi
       env:
         - name: ARGO_SERVER

diff --git a/templates/decapod-apps/lma-uniformed-wftpl.yaml b/templates/decapod-apps/lma-uniformed-wftpl.yaml
@@ -164,7 +164,6 @@ spec:
               [
                 { "app_group": "lma", "path": "prometheus", "namespace": "lma", "target_cluster": "" },
                 { "app_group": "lma", "path": "kube-state-metrics", "namespace": "lma", "target_cluster": "" },
-                { "app_group": "lma", "path": "prometheus-process-exporter", "namespace": "lma", "target_cluster": "" },
                 { "app_group": "lma", "path": "prometheus-pushgateway", "namespace": "lma", "target_cluster": "" },
                 { "app_group": "lma", "path": "prometheus-node-exporter", "namespace": "lma", "target_cluster": ""},
                 { "app_group": "lma", "path": "prometheus-adapter", "namespace": "lma", "target_cluster": "" },