lc/ROX-26523-dev-argocd (#2074)

ROX-26523: Install ArgoCD on local dev environment
stackrox · Oct 23, 2024 · cd84fd4 · cd84fd4
1 parent 7213056
commit cd84fd4
Show file tree

Hide file tree

Showing 11 changed files with 49 additions and 1 deletion.
diff --git a/dev/env/defaults/00-defaults.env b/dev/env/defaults/00-defaults.env
@@ -21,6 +21,9 @@ export INSTALL_OPENSHIFT_ROUTER_DEFAULT="true"
 export EXPOSE_OPENSHIFT_ROUTER_DEFAULT="false"
 export INSTALL_VERTICAL_POD_AUTOSCALER_DEFAULT="true"
 export INSTALL_VERTICAL_POD_AUTOSCALER_OLM_DEFAULT="false"
+export INSTALL_ARGOCD="true"
+export INSTALL_OPENSHIFT_GITOPS="false"
+export ARGOCD_NAMESPACE="argocd"
 export ENABLE_EMAIL_SENDER_DEFAULT="false"
 export EMAIL_SENDER_IMAGE_DEFAULT=""
 

diff --git a/dev/env/defaults/cluster-type-openshift/env b/dev/env/defaults/cluster-type-openshift/env
@@ -5,3 +5,6 @@ export INSTALL_OPENSHIFT_ROUTER_DEFAULT="false"
 export INSTALL_VERTICAL_POD_AUTOSCALER_DEFAULT="false"
 export INSTALL_VERTICAL_POD_AUTOSCALER_OLM_DEFAULT="true"
 export ENABLE_EXTERNAL_CONFIG_DEFAULT="false"
+export INSTALL_ARGOCD="false"
+export INSTALL_OPENSHIFT_GITOPS="true"
+export ARGOCD_NAMESPACE="openshift-gitops"
diff --git a/dev/env/manifests/fleetshard-operator/28-deployment.yaml b/dev/env/manifests/fleetshard-operator/28-deployment.yaml
@@ -32,6 +32,8 @@ spec:
                 fieldPath: metadata.namespace
           - name: ADDON_NAME
             value: acs-fleetshard-dev
+          - name: ARGOCD_NAMESPACE
+            value: "${ARGOCD_NAMESPACE}"
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:

diff --git a/dev/env/manifests/openshift-gitops/00-namespace.yaml b/dev/env/manifests/openshift-gitops/00-namespace.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: openshift-gitops-operator
diff --git a/dev/env/manifests/openshift-gitops/01-operator-group.yaml b/dev/env/manifests/openshift-gitops/01-operator-group.yaml
@@ -0,0 +1,7 @@
+apiVersion: operators.coreos.com/v1
+kind: OperatorGroup
+metadata:
+  name: openshift-gitops-operator
+  namespace: openshift-gitops-operator
+spec:
+  upgradeStrategy: Default
diff --git a/dev/env/manifests/openshift-gitops/02-subscription.yaml b/dev/env/manifests/openshift-gitops/02-subscription.yaml
@@ -0,0 +1,11 @@
+apiVersion: operators.coreos.com/v1alpha1
+kind: Subscription
+metadata:
+  name: openshift-gitops-operator
+  namespace: openshift-gitops-operator
+spec:
+  channel: latest
+  installPlanApproval: Automatic
+  name: openshift-gitops-operator
+  source: redhat-operators
+  sourceNamespace: openshift-marketplace
diff --git a/dev/env/scripts/bootstrap.sh b/dev/env/scripts/bootstrap.sh
@@ -52,6 +52,18 @@ else
     log "Skipping installation of Vertical Pod Autoscaler"
 fi
 
+if [[ "$INSTALL_ARGOCD" == "true" ]]; then
+    log "Installing ArgoCD"
+    kubectl create ns argocd || true
+    kubectl apply -n argocd -f https://raw.githubusercontent.com/argoproj/argo-cd/stable/manifests/install.yaml
+elif [[ "$INSTALL_OPENSHIFT_GITOPS" == "true" ]]; then
+    log "Installing Openshift GitOps"
+    apply "${MANIFESTS_DIR}/openshift-gitops"
+else
+    log "One of ArgoCD or OpenShift GitOps must be installed"
+    exit 1
+fi
+
 # skip manifests if openshift cluster using is_openshift_cluster
 if ! is_openshift_cluster "$CLUSTER_TYPE"; then
     apply "${MANIFESTS_DIR}/monitoring"

diff --git a/dev/env/scripts/lib.sh b/dev/env/scripts/lib.sh
@@ -174,6 +174,9 @@ INSTALL_OPENSHIFT_ROUTER: ${INSTALL_OPENSHIFT_ROUTER}
 EXPOSE_OPENSHIFT_ROUTER: ${EXPOSE_OPENSHIFT_ROUTER}
 INSTALL_VERTICAL_POD_AUTOSCALER: ${INSTALL_VERTICAL_POD_AUTOSCALER}
 INSTALL_VERTICAL_POD_AUTOSCALER_OLM: ${INSTALL_VERTICAL_POD_AUTOSCALER_OLM}
+INSTALL_ARGOCD: ${INSTALL_ARGOCD}
+INSTALL_OPENSHIFT_GITOPS: ${INSTALL_OPENSHIFT_GITOPS}
+ARGOCD_NAMESPACE: ${ARGOCD_NAMESPACE}
 OCM_SERVICE_CLIENT_ID: ********
 OCM_SERVICE_CLIENT_SECRET: ********
 OCM_SERVICE_TOKEN: ********

diff --git a/dev/env/scripts/up.sh b/dev/env/scripts/up.sh
@@ -78,7 +78,7 @@ apply "${MANIFESTS_DIR}/fleetshard-operator"
 
 wait_for_container_to_appear "$ACSCS_NAMESPACE" "app=fleetshard-sync" "fleetshard-sync"
 if [[ "$SPAWN_LOGGER" == "true" && -n "${LOG_DIR:-}" ]]; then
-    $KUBECTL -n "$ACSCS_NAMESPACE" logs -l application=fleetshard-sync --all-containers --pod-running-timeout=1m --since=1m --tail=100 -f >"${LOG_DIR}/pod-logs_fleetshard-sync_fleetshard-sync.txt" 2>&1 &
+    $KUBECTL -n "$ACSCS_NAMESPACE" logs -l app=fleetshard-sync --all-containers --pod-running-timeout=1m --since=1m --tail=100 -f >"${LOG_DIR}/pod-logs_fleetshard-sync_fleetshard-sync.txt" 2>&1 &
 fi
 
 if [[ "$ENABLE_EMAIL_SENDER" == "true" ]]; then

diff --git a/dp-terraform/helm/rhacs-terraform/templates/fleetshard-sync.yaml b/dp-terraform/helm/rhacs-terraform/templates/fleetshard-sync.yaml
@@ -134,6 +134,8 @@ spec:
         {{- end }}
         - name: RHACS_PRINT_CENTRAL_UPDATE_DIFF
           value: {{ .Values.fleetshardSync.printCentralUpdateDiff | quote }}
+        - name: ARGOCD_NAMESPACE
+          value: {{ .Values.fleetshardSync.argoCdNamespace | quote }}
         volumeMounts:
           - mountPath: /var/run/secrets/tokens
             name: tokens

diff --git a/dp-terraform/helm/rhacs-terraform/values.yaml b/dp-terraform/helm/rhacs-terraform/values.yaml
@@ -65,6 +65,7 @@ fleetshardSync:
     name: ""
     key: .dockerconfigjson
   printCentralUpdateDiff: false
+  argoCdNamespace: openshift-gitops
 
 # Email sender service parameters
 # - enabled flag is used to completely enable/disable email sender service