Merge pull request #173 from maxcao13/fix-upgrade

PODAUTO-225: Fix e2e-olm-upgrade bugs
openshift · Sep 9, 2024 · aa2533a · aa2533a
2 parents 5ae0d39 + 85fa84f
commit aa2533a
Show file tree

Hide file tree

Showing 25 changed files with 358 additions and 419 deletions.
diff --git a/Makefile b/Makefile
@@ -45,7 +45,7 @@ IMAGE_TAG_BASE ?= quay.io/openshift/origin-vertical-pod-autoscaler-operator
 BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:$(BUNDLE_VERSION)
 
 # BUNDLE_GEN_FLAGS are the flags passed to the operator-sdk generate bundle command
-BUNDLE_GEN_FLAGS ?= -q --overwrite --version $(BUNDLE_VERSION) $(BUNDLE_METADATA_OPTS)
+BUNDLE_GEN_FLAGS ?= -q --overwrite --version $(BUNDLE_VERSION) $(BUNDLE_METADATA_OPTS) --extra-service-accounts=vpa-admission-controller,vpa-recommender,vpa-updater
 
 # USE_IMAGE_DIGESTS defines if images are resolved via tags or digests
 # You can enable this value if you would like to use SHA Based Digests
@@ -155,7 +155,7 @@ lint-fix: golangci-lint ## Run golangci-lint and perform fixes.
 
 .PHONY: test-scorecard
 test-scorecard: operator-sdk ## Run the scorecard tests. Requires an OpenShift cluster.
-	$(OPERATOR_SDK) scorecard bundle -n default
+	$(OPERATOR_SDK) scorecard bundle -n default -w 300s
 
 .PHONY: check
 check: fmt vet manifest-diff lint test ## Check code for formatting, vet, lint, manifest-diff and run tests.

diff --git a/bundle/manifests/system-evictioner_rbac.authorization.k8s.io_v1_clusterrole.yaml b/bundle/manifests/system-evictioner_rbac.authorization.k8s.io_v1_clusterrole.yaml
diff --git a/bundle/manifests/system-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml b/bundle/manifests/system-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml
diff --git a/bundle/manifests/system-metrics-reader_rbac.authorization.k8s.io_v1_clusterrolebinding.yaml b/bundle/manifests/system-metrics-reader_rbac.authorization.k8s.io_v1_clusterrolebinding.yaml
diff --git a/bundle/manifests/system-vpa-actor_rbac.authorization.k8s.io_v1_clusterrole.yaml b/bundle/manifests/system-vpa-actor_rbac.authorization.k8s.io_v1_clusterrole.yaml
diff --git a/bundle/manifests/system-vpa-actor_rbac.authorization.k8s.io_v1_clusterrolebinding.yaml b/bundle/manifests/system-vpa-actor_rbac.authorization.k8s.io_v1_clusterrolebinding.yaml
diff --git a/...e/manifests/system-vpa-admission-controller_rbac.authorization.k8s.io_v1_clusterrole.yaml b/...e/manifests/system-vpa-admission-controller_rbac.authorization.k8s.io_v1_clusterrole.yaml
diff --git a/...ests/system-vpa-admission-controller_rbac.authorization.k8s.io_v1_clusterrolebinding.yaml b/...ests/system-vpa-admission-controller_rbac.authorization.k8s.io_v1_clusterrolebinding.yaml
diff --git a/bundle/manifests/system-vpa-checkpoint-actor_rbac.authorization.k8s.io_v1_clusterrole.yaml b/bundle/manifests/system-vpa-checkpoint-actor_rbac.authorization.k8s.io_v1_clusterrole.yaml
diff --git a/...anifests/system-vpa-checkpoint-actor_rbac.authorization.k8s.io_v1_clusterrolebinding.yaml b/...anifests/system-vpa-checkpoint-actor_rbac.authorization.k8s.io_v1_clusterrolebinding.yaml
diff --git a/...ifests/system-vpa-evictioner-binding_rbac.authorization.k8s.io_v1_clusterrolebinding.yaml b/...ifests/system-vpa-evictioner-binding_rbac.authorization.k8s.io_v1_clusterrolebinding.yaml
diff --git a/bundle/manifests/system-vpa-status-actor_rbac.authorization.k8s.io_v1_clusterrole.yaml b/bundle/manifests/system-vpa-status-actor_rbac.authorization.k8s.io_v1_clusterrole.yaml
diff --git a/...le/manifests/system-vpa-status-actor_rbac.authorization.k8s.io_v1_clusterrolebinding.yaml b/...le/manifests/system-vpa-status-actor_rbac.authorization.k8s.io_v1_clusterrolebinding.yaml
diff --git a/...sts/system-vpa-status-reader-binding_rbac.authorization.k8s.io_v1_clusterrolebinding.yaml b/...sts/system-vpa-status-reader-binding_rbac.authorization.k8s.io_v1_clusterrolebinding.yaml
diff --git a/bundle/manifests/system-vpa-status-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml b/bundle/manifests/system-vpa-status-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml
diff --git a/...sts/system-vpa-target-reader-binding_rbac.authorization.k8s.io_v1_clusterrolebinding.yaml b/...sts/system-vpa-target-reader-binding_rbac.authorization.k8s.io_v1_clusterrolebinding.yaml