ROX-20144: Move canary e2e to gitops (#1339)

* Move canary e2e to gitops * Fix canary e2e operator tests * Fix central creating tests * Turn off leader-election
stackrox · Oct 12, 2023 · d61ed3e · d61ed3e
1 parent e11543c
commit d61ed3e
Show file tree

Hide file tree

Showing 4 changed files with 198 additions and 123 deletions.
diff --git a/dev/env/manifests/fleet-manager/04-gitops-config.yaml b/dev/env/manifests/fleet-manager/04-gitops-config.yaml
@@ -13,7 +13,7 @@ data:
 
       operators:
 
-        - deploymentName: "rhacs-operator-4-2-1-rc.3"
+        - deploymentName: "rhacs-operator-4.2.1-rc.3"
           image: "quay.io/rhacs-eng/stackrox-operator:4.2.1-rc.3"
           centralLabelSelector: "rhacs.redhat.com/version-selector=4.2.1-rc.3"
           securedClusterReconcilerEnabled: false
@@ -22,27 +22,24 @@ data:
               cpu: 100m
               memory: 200Mi
 
-        - deploymentName: "rhacs-operator-4-2-1"
-          image: "quay.io/rhacs-eng/stackrox-operator:4.2.1"
-          centralLabelSelector: "rhacs.redhat.com/version-selector=4.2.1"
+        - deploymentName: "rhacs-operator-4.2.2-rc.0"
+          image: "quay.io/rhacs-eng/stackrox-operator:4.2.2-rc.0"
+          centralLabelSelector: "rhacs.redhat.com/version-selector=4.2.2-rc.0"
           securedClusterReconcilerEnabled: false
           resources:
             requests:
               cpu: 100m
               memory: 200Mi
     centrals:
       overrides:
-        # Set label for all centrals to 4.2.1
-        - instanceIds: ["*"]
-          patch: |
-            metadata:
-              labels:
-                rhacs.redhat.com/version-selector: "4.2.1"
-
-        # Adjust centrals for development environment
         - instanceIds:
             - "*"
           patch: |
+            # Set label for all centrals to 4.2.1-rc.3
+            metadata:
+              labels:
+                rhacs.redhat.com/version-selector: "4.2.1-rc.3"
+            # Adjust centrals for development environment
             spec:
               central:
                 monitoring:

diff --git a/dev/env/scripts/reset b/dev/env/scripts/reset
@@ -15,4 +15,11 @@ sleep 1
 
 delete_tenant_namespaces
 
+log "Clean ACS operator namespace..."
+$KUBECTL delete namespace "$STACKROX_OPERATOR_NAMESPACE" || true
+apply "${GITROOT}/dev/env/manifests/rhacs-operator/00-namespace.yaml"
+
+log "Apply default gitops..."
+apply "${GITROOT}/dev/env/manifests/fleet-manager/04-gitops-config.yaml"
+
 log "Resetting complete."