Have both auth and no-auth manifests

Signed-off-by: May Zhang <may_zhang@intuit.com>
mayzhang2000 · May 3, 2024 · 7108909 · 7108909
1 parent 46a7f4d
commit 7108909
Show file tree

Hide file tree

Showing 96 changed files with 80,417 additions and 181 deletions.
diff --git a/hack/update-manifests.sh b/hack/update-manifests.sh
@@ -31,21 +31,40 @@ fi
 $KUSTOMIZE version
 which $KUSTOMIZE
 
-cd ${SRCROOT}/manifests/base && $KUSTOMIZE edit set image quay.io/argoproj/argocd=${IMAGE_NAMESPACE}/argocd:${IMAGE_TAG}
-cd ${SRCROOT}/manifests/ha/base && $KUSTOMIZE edit set image quay.io/argoproj/argocd=${IMAGE_NAMESPACE}/argocd:${IMAGE_TAG}
-cd ${SRCROOT}/manifests/core-install && $KUSTOMIZE edit set image quay.io/argoproj/argocd=${IMAGE_NAMESPACE}/argocd:${IMAGE_TAG}
+cd ${SRCROOT}/manifests/base/auth && $KUSTOMIZE edit set image quay.io/argoproj/argocd=${IMAGE_NAMESPACE}/argocd:${IMAGE_TAG}
+cd ${SRCROOT}/manifests/base/noauth && $KUSTOMIZE edit set image quay.io/argoproj/argocd=${IMAGE_NAMESPACE}/argocd:${IMAGE_TAG}
+
+cd ${SRCROOT}/manifests/ha/base/auth && $KUSTOMIZE edit set image quay.io/argoproj/argocd=${IMAGE_NAMESPACE}/argocd:${IMAGE_TAG}
+cd ${SRCROOT}/manifests/ha/base/noauth && $KUSTOMIZE edit set image quay.io/argoproj/argocd=${IMAGE_NAMESPACE}/argocd:${IMAGE_TAG}
+
+cd ${SRCROOT}/manifests/core-install/base && $KUSTOMIZE edit set image quay.io/argoproj/argocd=${IMAGE_NAMESPACE}/argocd:${IMAGE_TAG}
 
 echo "${AUTOGENMSG}" > "${SRCROOT}/manifests/install.yaml"
-$KUSTOMIZE build "${SRCROOT}/manifests/cluster-install" >> "${SRCROOT}/manifests/install.yaml"
+$KUSTOMIZE build "${SRCROOT}/manifests/cluster-install/auth" >> "${SRCROOT}/manifests/install.yaml"
+
+echo "${AUTOGENMSG}" > "${SRCROOT}/manifests/install-noauth.yaml"
+$KUSTOMIZE build "${SRCROOT}/manifests/cluster-install/noauth" >> "${SRCROOT}/manifests/install-noauth.yaml"
 
 echo "${AUTOGENMSG}" > "${SRCROOT}/manifests/namespace-install.yaml"
-$KUSTOMIZE build "${SRCROOT}/manifests/namespace-install" >> "${SRCROOT}/manifests/namespace-install.yaml"
+$KUSTOMIZE build "${SRCROOT}/manifests/namespace-install/auth" >> "${SRCROOT}/manifests/namespace-install.yaml"
 
-echo "${AUTOGENMSG}" > "${SRCROOT}/manifests/ha/install.yaml"
-$KUSTOMIZE build "${SRCROOT}/manifests/ha/cluster-install" >> "${SRCROOT}/manifests/ha/install.yaml"
+echo "${AUTOGENMSG}" > "${SRCROOT}/manifests/namespace-install-noauth.yaml"
+$KUSTOMIZE build "${SRCROOT}/manifests/namespace-install/noauth" >> "${SRCROOT}/manifests/namespace-install-noauth.yaml"
 
+echo "${AUTOGENMSG}" > "${SRCROOT}/manifests/ha/install.yaml"
+$KUSTOMIZE build "${SRCROOT}/manifests/ha/cluster-install/auth" >> "${SRCROOT}/manifests/ha/install.yaml"
+#
+echo "${AUTOGENMSG}" > "${SRCROOT}/manifests/ha/install-noauth.yaml"
+$KUSTOMIZE build "${SRCROOT}/manifests/ha/cluster-install/noauth" >> "${SRCROOT}/manifests/ha/install-noauth.yaml"
+#
 echo "${AUTOGENMSG}" > "${SRCROOT}/manifests/ha/namespace-install.yaml"
-$KUSTOMIZE build "${SRCROOT}/manifests/ha/namespace-install" >> "${SRCROOT}/manifests/ha/namespace-install.yaml"
+$KUSTOMIZE build "${SRCROOT}/manifests/ha/namespace-install/auth" >> "${SRCROOT}/manifests/ha/namespace-install.yaml"
+#
+echo "${AUTOGENMSG}" > "${SRCROOT}/manifests/ha/namespace-install-noauth.yaml"
+$KUSTOMIZE build "${SRCROOT}/manifests/ha/namespace-install/noauth" >> "${SRCROOT}/manifests/ha/namespace-install-noauth.yaml"
 
 echo "${AUTOGENMSG}" > "${SRCROOT}/manifests/core-install.yaml"
-$KUSTOMIZE build "${SRCROOT}/manifests/core-install" >> "${SRCROOT}/manifests/core-install.yaml"
+$KUSTOMIZE build "${SRCROOT}/manifests/core-install/auth" >> "${SRCROOT}/manifests/core-install.yaml"
+
+echo "${AUTOGENMSG}" > "${SRCROOT}/manifests/core-install-noauth.yaml"
+$KUSTOMIZE build "${SRCROOT}/manifests/core-install/noauth" >> "${SRCROOT}/manifests/core-install-noauth.yaml"
diff --git a/manifests/base/auth/kustomization.yaml b/manifests/base/auth/kustomization.yaml
@@ -0,0 +1,17 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+
+images:
+- name: quay.io/argoproj/argocd
+  newName: quay.io/argoproj/argocd
+  newTag: latest
+resources:
+- ../application-controller
+- ../dex
+- ../repo-server
+- ../server
+- ../config
+- ../redis/auth
+- ../notification
+- ../applicationset-controller
diff --git a/manifests/base/noauth/kustomization.yaml b/manifests/base/noauth/kustomization.yaml
@@ -0,0 +1,17 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+
+images:
+- name: quay.io/argoproj/argocd
+  newName: quay.io/argoproj/argocd
+  newTag: latest
+resources:
+- ../application-controller
+- ../dex
+- ../repo-server
+- ../server
+- ../config
+- ../redis/noauth
+- ../notification
+- ../applicationset-controller
diff --git a/manifests/base/redis/auth/argocd-redis-deployment.yaml b/manifests/base/redis/auth/argocd-redis-deployment.yaml
@@ -0,0 +1,38 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: argocd-redis
+spec:
+  template:
+    spec:
+      containers:
+        - args:
+            - --save
+            - ""
+            - --appendonly
+            - "no"
+            - --requirepass $(REDIS_PASSWORD)
+          env:
+            - name: REDIS_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  key: auth
+                  name: argocd-redis
+          name: redis
+      initContainers:
+        - command:
+            - argocd
+            - admin
+            - redis-initial-password
+          image: quay.io/argoproj/argocd:latest
+          imagePullPolicy: IfNotPresent
+          name: secret-init
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+                - ALL
+            readOnlyRootFilesystem: true
+            runAsNonRoot: true
+            seccompProfile:
+              type: RuntimeDefault
diff --git a/manifests/base/redis/argocd-redis-role.yaml → ...ts/base/redis/auth/argocd-redis-role.yaml b/manifests/base/redis/argocd-redis-role.yaml → ...ts/base/redis/auth/argocd-redis-role.yaml
diff --git a/.../base/redis/argocd-redis-rolebinding.yaml → .../redis/auth/argocd-redis-rolebinding.yaml b/.../base/redis/argocd-redis-rolebinding.yaml → .../redis/auth/argocd-redis-rolebinding.yaml
diff --git a/manifests/base/redis/auth/kustomization.yaml b/manifests/base/redis/auth/kustomization.yaml
@@ -0,0 +1,10 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+- ../noauth
+- argocd-redis-role.yaml
+- argocd-redis-rolebinding.yaml
+
+patchesStrategicMerge:
+- argocd-redis-deployment.yaml
diff --git a/...s/base/redis/argocd-redis-deployment.yaml → ...redis/noauth/argocd-redis-deployment.yaml b/...s/base/redis/argocd-redis-deployment.yaml → ...redis/noauth/argocd-redis-deployment.yaml
@@ -15,23 +15,6 @@ spec:
       labels:
         app.kubernetes.io/name: argocd-redis
     spec:
-      initContainers:
-        - command:
-            - argocd
-            - admin
-            - redis-initial-password
-          image: quay.io/argoproj/argocd:latest
-          imagePullPolicy: IfNotPresent
-          name: secret-init
-          securityContext:
-            allowPrivilegeEscalation: false
-            capabilities:
-              drop:
-                - ALL
-            readOnlyRootFilesystem: true
-            runAsNonRoot: true
-            seccompProfile:
-              type: RuntimeDefault
       securityContext:
         runAsNonRoot: true
         runAsUser: 999
@@ -47,13 +30,6 @@ spec:
         - ""
         - "--appendonly"
         - "no"
-        - --requirepass $(REDIS_PASSWORD)
-        env:
-          - name: REDIS_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                key: auth
-                name: argocd-redis
         ports:
         - containerPort: 6379
         securityContext:

diff --git a/...se/redis/argocd-redis-network-policy.yaml → ...s/noauth/argocd-redis-network-policy.yaml b/...se/redis/argocd-redis-network-policy.yaml → ...s/noauth/argocd-redis-network-policy.yaml
diff --git a/manifests/base/redis/argocd-redis-sa.yaml → ...ts/base/redis/noauth/argocd-redis-sa.yaml b/manifests/base/redis/argocd-redis-sa.yaml → ...ts/base/redis/noauth/argocd-redis-sa.yaml
diff --git a/...ests/base/redis/argocd-redis-service.yaml → ...se/redis/noauth/argocd-redis-service.yaml b/...ests/base/redis/argocd-redis-service.yaml → ...se/redis/noauth/argocd-redis-service.yaml
diff --git a/manifests/base/redis/kustomization.yaml → ...ests/base/redis/noauth/kustomization.yaml b/manifests/base/redis/kustomization.yaml → ...ests/base/redis/noauth/kustomization.yaml
@@ -6,5 +6,3 @@ resources:
 - argocd-redis-sa.yaml
 - argocd-redis-service.yaml
 - argocd-redis-network-policy.yaml
-- argocd-redis-role.yaml
-- argocd-redis-rolebinding.yaml
diff --git a/...sts/ha/cluster-install/kustomization.yaml → ...s/cluster-install/auth/kustomization.yaml b/...sts/ha/cluster-install/kustomization.yaml → ...s/cluster-install/auth/kustomization.yaml
@@ -2,6 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-- ../namespace-install
+- ../../namespace-install/auth
 - ../../cluster-rbac
-- ../../crds
+- ../../crds
diff --git a/manifests/cluster-install/noauth/kustomization.yaml b/manifests/cluster-install/noauth/kustomization.yaml
@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+- ../../namespace-install/noauth
+- ../../cluster-rbac
+- ../../crds