diff --git a/e2e/e2e_canary_upgrade_test.go b/e2e/e2e_canary_upgrade_test.go index c8e64a23d..b601dbf20 100644 --- a/e2e/e2e_canary_upgrade_test.go +++ b/e2e/e2e_canary_upgrade_test.go @@ -40,10 +40,6 @@ const ( ) var ( - defaultCRDUrls = []string{ - "https://raw.githubusercontent.com/stackrox/stackrox/4.5.4/operator/bundle/manifests/platform.stackrox.io_securedclusters.yaml", - "https://raw.githubusercontent.com/stackrox/stackrox/4.5.4/operator/bundle/manifests/platform.stackrox.io_centrals.yaml", - } operatorConfig1 = operatorConfigForVersion(operatorVersion1) operatorConfig2 = operatorConfigForVersion(operatorVersion2) operator1DeploymentName = getDeploymentName(operatorVersion1) @@ -535,10 +531,6 @@ func reconciledByOperatorPatch(operatorConfig OperatorConfig) string { return `rolloutGroup: ` + value } -func forceReconcilePatch() string { - return `forceReconcile: true` -} - func minimalCentralResourcesPatch() string { return ` spec: @@ -588,15 +580,6 @@ spec: func defaultTenantResourceValues() string { return ` -labels: - app.kubernetes.io/managed-by: "rhacs-fleetshard" - app.kubernetes.io/instance: "{{ .Name }}" - rhacs.redhat.com/org-id: "{{ .OrganizationID }}" - rhacs.redhat.com/tenant: "{{ .ID }}" - rhacs.redhat.com/instance-type: "{{ .InstanceType }}" -annotations: - rhacs.redhat.com/org-name: "{{ .OrganizationName }}" -centralRdsCidrBlock: "10.1.0.0/16" centralVpaEnabled: false rolloutGroup: dev centralResources: @@ -661,18 +644,14 @@ func defaultApplications() []argocd.Application { } func restoreDefaultGitopsConfig() error { - defaultConfig, err := gitops.NewProvider().Get() - if err != nil { - defaultConfig = defaultGitopsConfig() - } - return putGitopsConfig(context.Background(), defaultConfig) + return putGitopsConfig(context.Background(), defaultGitopsConfig()) } func operator462() OperatorConfig { return OperatorConfig{ DeploymentName: "rhacs-operator-4.6.2", Image: "registry.redhat.io/advanced-cluster-security/rhacs-rhel8-operator@sha256:a96572d0df791da60763dec4b4f0f52124772c3649303170968806dcc3de8269", - CentralLabelSelector: "rhacs.redhat.com/version-selector=4.6.2", + CentralLabelSelector: "rhacs.redhat.com/version-selector=dev", } }