Add helm to e2e runtime

Author: kovayur

.github/workflows/multicluster-e2e.yaml

@@ -12,6 +12,7 @@ on:
       - 'scripts/lib/**'
       - 'internal/central/pkg/handlers/admin_central.go'
       - 'internal/central/pkg/services/central.go'
+      - 'deploy/charts/fleetshard-sync/**'
 
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
@@ -23,6 +24,7 @@ on:
       - 'scripts/lib/**'
       - 'internal/central/pkg/handlers/admin_central.go'
       - 'internal/central/pkg/services/central.go'
+      - 'deploy/charts/fleetshard-sync/**'
 
 # Cancel previous runs
 # see: https://docs.github.com/en/actions/how-tos/write-workflows/choose-when-workflows-run/control-workflow-concurrency

.openshift-ci/e2e-runtime/Dockerfile

@@ -34,6 +34,11 @@ RUN curl -L --retry 10 --silent --show-error --fail -o "/usr/local/bin/ocm" \
     "https://github.com/openshift-online/ocm-cli/releases/download/v${OCM_VERSION}/ocm-linux-amd64" && \
     chmod +x /usr/local/bin/ocm
 
+RUN curl -L --retry 10 --silent --show-error --fail -o /usr/local/bin/helm \
+    "https://mirror.openshift.com/pub/openshift-v4/clients/helm/latest/helm-linux-amd64" && \
+    chmod +x /usr/local/bin/helm && \
+    helm version
+
 RUN mkdir /src $GOPATH
 WORKDIR /src
 

Makefile

@@ -909,13 +909,17 @@ undeploy/emailsender:
 	@oc delete -n "$(NAMESPACE)" -f "dev/env/manifests/emailsender-db" --ignore-not-found=true
 .PHONY: undeploy/emailsender
 
+deploy/fleetshard-sync: FLEET_MANAGER_IMAGE?="$(IMAGE_NAME):$(image_tag)"
+deploy/fleetshard-sync: ARGOCD_TENANT_APP_TARGET_REVISION?="HEAD"
+deploy/fleetshard-sync: ARGOCD_NAMESPACE?="openshift-gitops"
+deploy/fleetshard-sync: MANAGED_DB_ENABLED?="false"
 deploy/fleetshard-sync:
 	@helm upgrade --install -n "$(NAMESPACE)" fleetshard-sync "deploy/charts/fleetshard-sync" \
 		--values "dev/env/values/fleetshard-sync/values.yaml" \
-		--set image.ref="$${FLEET_MANAGER_IMAGE:-$$(make full-image-tag)}" \
-		--set tenantDefaultAppSourceTargetRevision="$${ARGOCD_TENANT_APP_TARGET_REVISION:-HEAD}" \
-		--set argoCdNamespace="$${ARGOCD_NAMESPACE:-openshift-gitops}" \
-		--set managedDB.enabled="$${MANAGED_DB_ENABLED:-false}" \
+		--set image.ref="$(FLEET_MANAGER_IMAGE)" \
+		--set tenantDefaultAppSourceTargetRevision="$(ARGOCD_TENANT_APP_TARGET_REVISION)" \
+		--set argoCdNamespace="$(ARGOCD_NAMESPACE)" \
+		--set managedDB.enabled="$(MANAGED_DB_ENABLED)" \
 		--set managedDB.subnetGroup="$(MANAGED_DB_SUBNET_GROUP)" \
 		--set managedDB.securityGroup="$(MANAGED_DB_SECURITY_GROUP)"
 .PHONY: deploy/fleetshard-sync

dev/env/scripts/lib.sh

@@ -108,9 +108,6 @@ init() {
     export MANAGED_DB_ENABLED=${MANAGED_DB_ENABLED:-$MANAGED_DB_ENABLED_DEFAULT}
     export ARGOCD_TENANT_APP_TARGET_REVISION=${ARGOCD_TENANT_APP_TARGET_REVISION:-$ARGOCD_TENANT_APP_TARGET_REVISION_DEFAULT}
 
-    FLEETSHARD_SYNC_CONTAINER_COMMAND_DEFAULT="/usr/local/bin/fleetshard-sync"
-    export FLEETSHARD_SYNC_CONTAINER_COMMAND=${FLEETSHARD_SYNC_CONTAINER_COMMAND:-$FLEETSHARD_SYNC_CONTAINER_COMMAND_DEFAULT}
-
     if [[ "$FLEET_MANAGER_IMAGE" == "" ]]; then
         FLEET_MANAGER_IMAGE=$(make -s -C "$GITROOT" full-image-tag)
         log "FLEET_MANAGER_IMAGE not set, using ${FLEET_MANAGER_IMAGE}"
@@ -169,7 +166,6 @@ ENABLE_FM_PORT_FORWARDING: ${ENABLE_FM_PORT_FORWARDING}
 SKIP_TESTS: ${SKIP_TESTS}
 ENABLE_CENTRAL_EXTERNAL_DOMAIN: ${ENABLE_CENTRAL_EXTERNAL_DOMAIN}
 FLEET_MANAGER_IMAGE: ${FLEET_MANAGER_IMAGE}
-FLEETSHARD_SYNC_CONTAINER_COMMAND: ${FLEETSHARD_SYNC_CONTAINER_COMMAND}
 EMAIL_SENDER_IMAGE: ${EMAIL_SENDER_IMAGE}
 PATH: ${PATH}
 EOF

dev/env/scripts/up.sh

@@ -83,29 +83,27 @@ fi
 # Sanity check.
 wait_for_container_to_become_ready "$ACSCS_NAMESPACE" "app=fleetshard-sync" "fleetshard-sync" 500
 
-if [[ -z "${DATAPLANE_ONLY}" ]]; then
-    # Prerequisite for port-forwarding are pods in ready state.
-    wait_for_container_to_become_ready "$ACSCS_NAMESPACE" "app=fleet-manager" "service"
-
-    if [[ "$ENABLE_FM_PORT_FORWARDING" == "true" ]]; then
-        log "Starting port-forwarding for fleet-manager"
-        port-forwarding start fleet-manager 8000 8000
-    else
-        log "Skipping port-forwarding for fleet-manager"
-    fi
-
-    if [[ "$ENABLE_DB_PORT_FORWARDING" == "true" ]]; then
-        log "Starting port-forwarding for db"
-        port-forwarding start fleet-manager-db 5432 5432
-    else
-        log "Skipping port-forwarding for db"
-    fi
-fi
+# Prerequisite for port-forwarding are pods in ready state.
+wait_for_container_to_become_ready "$ACSCS_NAMESPACE" "app=fleet-manager" "service"
 
 if [[ "$ENABLE_EMAIL_SENDER" == "true" ]]; then
     wait_for_container_to_become_ready "$ACSCS_NAMESPACE" "application=emailsender" "emailsender"
 fi
 
+if [[ "$ENABLE_FM_PORT_FORWARDING" == "true" ]]; then
+    log "Starting port-forwarding for fleet-manager"
+    port-forwarding start fleet-manager 8000 8000
+else
+    log "Skipping port-forwarding for fleet-manager"
+fi
+
+if [[ "$ENABLE_DB_PORT_FORWARDING" == "true" ]]; then
+    log "Starting port-forwarding for db"
+    port-forwarding start fleet-manager-db 5432 5432
+else
+    log "Skipping port-forwarding for db"
+fi
+
 log
 log "** Fleet Manager ready ** "
 log

dev/env/values/fleetshard-sync/values.yaml

@@ -21,3 +21,5 @@ resources:
   limits:
     cpu: 200m
     memory: 300Mi
+managedDB:
+  enabled: false

scripts/ci/multicluster_tests/deploy.sh

@@ -39,14 +39,17 @@ kubectl apply -f fm-dataplane-config.yaml
 kubectl delete pod -n rhacs -l app=fleet-manager
 
 export KUBECONFIG="$CLUSTER_2_KUBECONFIG"
-make deploy/bootstrap deploy/fleetshard-sync
+# Bootstrap and push the fleet manager image to the internal openshift registry on cluster2
+make deploy/bootstrap image/push/internal
 
 # Get a static token from cluster1 which will be used for FS -> FM communication
 # for the FS running on cluster2
 STATIC_TOKEN=$(KUBECONFIG="$CLUSTER_1_KUBECONFIG" kubectl create token -n rhacs fleetshard-sync --audience acs-fleet-manager-private-api --duration 8760h)
 
-# Configure FS on cluster2 to reach out to FM on cluster1
-helm upgrade -n rhacs fleetshard-sync \
+# Deploy FS on cluster2 to reach out to FM on cluster1
+helm upgrade -n rhacs fleetshard-sync ./deploy/charts/fleetshard-sync  \
+    --values "dev/env/values/fleetshard-sync/values.yaml" \
+    --set image.ref="$(make --no-print-directory full-image-tag)" \
     --set authType=STATIC_TOKEN \
     --set staticToken="${STATIC_TOKEN}" \
     --set fleetManagerEndpoint="${FM_URL}" \