From bac9bc7f00ec143ad930c3aaf058968bcb91cc09 Mon Sep 17 00:00:00 2001 From: Max Cao Date: Thu, 29 Aug 2024 12:50:42 -0700 Subject: [PATCH 1/4] Fix deprecated function that causes staticcheck warning --- internal/operator/status.go | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/internal/operator/status.go b/internal/operator/status.go index 37d77501..bb2961ce 100644 --- a/internal/operator/status.go +++ b/internal/operator/status.go @@ -265,18 +265,12 @@ func (r *StatusReporter) Start(c context.Context) error { // Poll the status of our prerequisites and set our status // accordingly. Rather than return errors and stop polling, most // errors here should just be reported in the status message. - pollFunc := func() (bool, error) { + pollFunc := func(context.Context) (bool, error) { + // TODO(jkyros): This doesn't handle the context yet, but someday it probably should return r.ReportStatus() } - // TODO(macao): This function is deprecated and triggers a linter warning. Should fix it in post merge tasks. - //nolint: staticcheck - err := wait.PollImmediateUntil(interval, pollFunc, c.Done()) - - // Block until the stop channel is closed. - <-c.Done() - - return err + return wait.PollUntilContextCancel(c, interval, true, pollFunc) } // ReportStatus checks the status of each dependency and operand and reports the From 4f41bd09f9287a69fafcd9e915b3c7162b5350ed Mon Sep 17 00:00:00 2001 From: Max Cao Date: Thu, 29 Aug 2024 14:16:01 -0700 Subject: [PATCH 2/4] Add yamllint hack and Makefile target Adds a hack shell script to run yamllint in the repository. The shell script fetches a community image that contains a new-ish version of yamllint (1.32.0), copies our source, and runs the yamllint program. This change also includes any changes that yamllint flagged on our current repo. This change also adds a .yamllint config file. --- .golangci.yml | 56 +++++++++---------- .yamllint | 20 +++++++ Makefile | 5 ++ ...scaler-operator.clusterserviceversion.yaml | 5 +- config/crd/kustomization.yaml | 14 ++--- config/default/kustomization.yaml | 10 ++-- ...scaler-operator.clusterserviceversion.yaml | 3 +- config/manifests/kustomization.yaml | 4 +- config/prometheus/monitor.yaml | 12 ++-- config/rbac/kustomization.yaml | 34 +++++------ .../autoscaling_v1_verticalpodautoscaler.yaml | 20 +++---- config/samples/kustomization.yaml | 4 +- config/scorecard/kustomization.yaml | 2 +- hack/yaml-lint.sh | 15 +++++ 14 files changed, 123 insertions(+), 81 deletions(-) create mode 100644 .yamllint create mode 100755 hack/yaml-lint.sh diff --git a/.golangci.yml b/.golangci.yml index 41a0d214..8a743d14 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -9,36 +9,36 @@ issues: # restore some of the defaults # (fill in the rest as needed) exclude-rules: - - path: "api/*" - linters: - - lll - - path: "internal/*" - linters: - - dupl - - lll + - path: "api/*" + linters: + - lll + - path: "internal/*" + linters: + - dupl + - lll # exclude some testutils exclude-dirs: - - cmd/testutil - - vendor + - cmd/testutil + - vendor linters: disable-all: true enable: - - dupl - - errcheck - - exportloopref - - goconst - - gocyclo - - gofmt - - goimports - - gosimple - - govet - - ineffassign - - lll - - misspell - - nakedret - - prealloc - - staticcheck - - typecheck - - unconvert - - unparam - - unused + - dupl + - errcheck + - exportloopref + - goconst + - gocyclo + - gofmt + - goimports + - gosimple + - govet + - ineffassign + - lll + - misspell + - nakedret + - prealloc + - staticcheck + - typecheck + - unconvert + - unparam + - unused diff --git a/.yamllint b/.yamllint new file mode 100644 index 00000000..dcb2b1e1 --- /dev/null +++ b/.yamllint @@ -0,0 +1,20 @@ +extends: default + +rules: + indentation: + indent-sequences: false + spaces: 2 + line-length: + level: warning + max: 180 # 180 seems a little big, but CSVs and CRDs can be long, so no bigger than that + document-start: disable + +ignore: +- _output/ +- bin/ +- vendor/ +- config/vpa/vpa-crd.yaml +- config/vpa/vpa-rbac.yaml +- config/vpa/vpacheckpoint-crd.yaml + +# we need to ignore vpa yamls because manifest-diff-upstream copies it directly from the upstream repo and expects no git diff diff --git a/Makefile b/Makefile index a67128b4..8ef1412d 100644 --- a/Makefile +++ b/Makefile @@ -127,6 +127,11 @@ vet: ## Run go vet against code. manifest-diff: build-testutil ## Compare permissions and CRDs from upstream manifests. hack/manifest-diff-upstream.sh +# yamllint source is here: https://github.com/adrienverge/yamllint +.PHONY: yamllint +yamllint: ## Run yamllint against manifests. + hack/yaml-lint.sh + # TODO(macao): Future task to migrate to using envtest https://sdk.operatorframework.io/docs/building-operators/golang/testing/ .PHONY: test test: manifests generate fmt vet envtest ## Run tests. diff --git a/bundle/manifests/vertical-pod-autoscaler-operator.clusterserviceversion.yaml b/bundle/manifests/vertical-pod-autoscaler-operator.clusterserviceversion.yaml index 8b97594e..713fed5d 100644 --- a/bundle/manifests/vertical-pod-autoscaler-operator.clusterserviceversion.yaml +++ b/bundle/manifests/vertical-pod-autoscaler-operator.clusterserviceversion.yaml @@ -22,7 +22,7 @@ metadata: categories: OpenShift Optional certifiedLevel: Primed containerImage: quay.io/openshift/origin-vertical-pod-autoscaler-operator:4.17.0 - createdAt: "2024-08-28T00:36:30Z" + createdAt: "2024-08-29T21:23:54Z" description: An operator to run the OpenShift Vertical Pod Autoscaler. Vertical Pod Autoscaler (VPA) can be configured to monitor a workload's resource utilization, and then adjust its CPU and memory limits by updating the pod (future) or restarting @@ -130,7 +130,8 @@ spec: the pod with updated limits. displayName: Vertical Pod Autoscaler Operator icon: - - base64data: PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxOTIgMTQ1Ij48ZGVmcz48c3R5bGU+LmNscy0xe2ZpbGw6I2UwMDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPlJlZEhhdC1Mb2dvLUhhdC1Db2xvcjwvdGl0bGU+PHBhdGggZD0iTTE1Ny43Nyw2Mi42MWExNCwxNCwwLDAsMSwuMzEsMy40MmMwLDE0Ljg4LTE4LjEsMTcuNDYtMzAuNjEsMTcuNDZDNzguODMsODMuNDksNDIuNTMsNTMuMjYsNDIuNTMsNDRhNi40Myw2LjQzLDAsMCwxLC4yMi0xLjk0bC0zLjY2LDkuMDZhMTguNDUsMTguNDUsMCwwLDAtMS41MSw3LjMzYzAsMTguMTEsNDEsNDUuNDgsODcuNzQsNDUuNDgsMjAuNjksMCwzNi40My03Ljc2LDM2LjQzLTIxLjc3LDAtMS4wOCwwLTEuOTQtMS43My0xMC4xM1oiLz48cGF0aCBjbGFzcz0iY2xzLTEiIGQ9Ik0xMjcuNDcsODMuNDljMTIuNTEsMCwzMC42MS0yLjU4LDMwLjYxLTE3LjQ2YTE0LDE0LDAsMCwwLS4zMS0zLjQybC03LjQ1LTMyLjM2Yy0xLjcyLTcuMTItMy4yMy0xMC4zNS0xNS43My0xNi42QzEyNC44OSw4LjY5LDEwMy43Ni41LDk3LjUxLjUsOTEuNjkuNSw5MCw4LDgzLjA2LDhjLTYuNjgsMC0xMS42NC01LjYtMTcuODktNS42LTYsMC05LjkxLDQuMDktMTIuOTMsMTIuNSwwLDAtOC40MSwyMy43Mi05LjQ5LDI3LjE2QTYuNDMsNi40MywwLDAsMCw0Mi41Myw0NGMwLDkuMjIsMzYuMywzOS40NSw4NC45NCwzOS40NU0xNjAsNzIuMDdjMS43Myw4LjE5LDEuNzMsOS4wNSwxLjczLDEwLjEzLDAsMTQtMTUuNzQsMjEuNzctMzYuNDMsMjEuNzdDNzguNTQsMTA0LDM3LjU4LDc2LjYsMzcuNTgsNTguNDlhMTguNDUsMTguNDUsMCwwLDEsMS41MS03LjMzQzIyLjI3LDUyLC41LDU1LC41LDc0LjIyYzAsMzEuNDgsNzQuNTksNzAuMjgsMTMzLjY1LDcwLjI4LDQ1LjI4LDAsNTYuNy0yMC40OCw1Ni43LTM2LjY1LDAtMTIuNzItMTEtMjcuMTYtMzAuODMtMzUuNzgiLz48L3N2Zz4= + - base64data: | + PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxOTIgMTQ1Ij48ZGVmcz48c3R5bGU+LmNscy0xe2ZpbGw6I2UwMDt9PC9zdHlsZT48L2RlZnM\+PHRpdGxlPlJlZEhhdC1Mb2dvLUhhdC1Db2xvcjwvdGl0bGU+PHBhdGggZD0iTTE1Ny43Nyw2Mi42MWExNCwxNCwwLDAsMSwuMzEsMy40MmMwLDE0Ljg4LTE4LjEsMTcuNDYtMzAuNjEsMTcuNDZDNzguODMsODMuNDksNDIuNTMsNTMuMjYsNDIuNTMsNDRhNi40Myw2LjQzLDAsMCwxLC4yMi0xLjk0bC0zLjY2LDkuMDZhMTguNDUsMTguNDUsMCwwLDAtMS41MSw3LjMzYzAsMTguMTEsNDEsNDUuNDgsODcuNzQsNDUuNDgsMjAuNjksMCwzNi40My03Ljc2LDM2LjQzLTIxLjc3LDAtMS4wOCwwLTEuOTQtMS43My0xMC4xM1oiLz48cGF0aCBjbGFzcz0iY2xzLTEiIGQ9Ik0xMjcuNDcsODMuNDljMTIuNTEsMCwzMC42MS0yLjU4LDMwLjYxLTE3LjQ2YTE0LDE0LDAsMCwwLS4zMS0zLjQybC03LjQ1LTMyLjM2Yy0xLjcyLTcuMTItMy4yMy0xMC4zNS0xNS43My0xNi42QzEyNC44OSw4LjY5LDEwMy43Ni41LDk3LjUxLjUsOTEuNjkuNSw5MCw4LDgzLjA2LDhjLTYuNjgsMC0xMS42NC01LjYtMTcuODktNS42LTYsMC05LjkxLDQuMDktMTIuOTMsMTIuNSwwLDAtOC40MSwyMy43Mi05LjQ5LDI3LjE2QTYuNDMsNi40MywwLDAsMCw0Mi41Myw0NGMwLDkuMjIsMzYuMywzOS40NSw4NC45NCwzOS40NU0xNjAsNzIuMDdjMS43Myw4LjE5LDEuNzMsOS4wNSwxLjczLDEwLjEzLDAsMTQtMTUuNzQsMjEuNzctMzYuNDMsMjEuNzdDNzguNTQsMTA0LDM3LjU4LDc2LjYsMzcuNTgsNTguNDlhMTguNDUsMTguNDUsMCwwLDEsMS41MS03LjMzQzIyLjI3LDUyLC41LDU1LC41LDc0LjIyYzAsMzEuNDgsNzQuNTksNzAuMjgsMTMzLjY1LDcwLjI4LDQ1LjI4LDAsNTYuNy0yMC40OCw1Ni43LTM2LjY1LDAtMTIuNzItMTEtMjcuMTYtMzAuODMtMzUuNzgiLz48L3N2Zz4= mediatype: image/svg+xml install: spec: diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml index 94c54ef6..4d2da150 100644 --- a/config/crd/kustomization.yaml +++ b/config/crd/kustomization.yaml @@ -3,21 +3,21 @@ # It should be run by config/default resources: - bases/autoscaling.openshift.io_verticalpodautoscalercontrollers.yaml -#+kubebuilder:scaffold:crdkustomizeresource +# +kubebuilder:scaffold:crdkustomizeresource # patches: # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix. # patches here are for enabling the conversion webhook for each CRD -#- path: patches/webhook_in_verticalpodautoscalercontrollers.yaml -#+kubebuilder:scaffold:crdkustomizewebhookpatch +# - path: patches/webhook_in_verticalpodautoscalercontrollers.yaml +# +kubebuilder:scaffold:crdkustomizewebhookpatch # [CERTMANAGER] To enable cert-manager, uncomment all the sections with [CERTMANAGER] prefix. # patches here are for enabling the CA injection for each CRD -#- path: patches/cainjection_in_verticalpodautoscalercontrollers.yaml -#+kubebuilder:scaffold:crdkustomizecainjectionpatch +# - path: patches/cainjection_in_verticalpodautoscalercontrollers.yaml +# +kubebuilder:scaffold:crdkustomizecainjectionpatch # [WEBHOOK] To enable webhook, uncomment the following section # the following config is for teaching kustomize how to do kustomization for CRDs. -#configurations: -#- kustomizeconfig.yaml +# configurations: +# - kustomizeconfig.yaml diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index 86628572..1407cc97 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -5,8 +5,8 @@ commonLabels: app.kubernetes.io/name: vertical-pod-autoscaler-operator # Labels to add to all resources and selectors. -#labels: -#- includeSelectors: true +# labels: +# - includeSelectors: true # pairs: # someName: someValue @@ -17,11 +17,11 @@ resources: - ../vpa # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in # crd/kustomization.yaml -#- ../webhook +# - ../webhook # [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'. 'WEBHOOK' components are required. -#- ../certmanager +# - ../certmanager # [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'. -#- ../prometheus +# - ../prometheus patches: - path: manager_auth_proxy_patch.yaml diff --git a/config/manifests/bases/vertical-pod-autoscaler-operator.clusterserviceversion.yaml b/config/manifests/bases/vertical-pod-autoscaler-operator.clusterserviceversion.yaml index e0abcfc9..1bb62966 100644 --- a/config/manifests/bases/vertical-pod-autoscaler-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/vertical-pod-autoscaler-operator.clusterserviceversion.yaml @@ -109,7 +109,8 @@ spec: the pod with updated limits. displayName: Vertical Pod Autoscaler Operator icon: - - base64data: PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxOTIgMTQ1Ij48ZGVmcz48c3R5bGU+LmNscy0xe2ZpbGw6I2UwMDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPlJlZEhhdC1Mb2dvLUhhdC1Db2xvcjwvdGl0bGU+PHBhdGggZD0iTTE1Ny43Nyw2Mi42MWExNCwxNCwwLDAsMSwuMzEsMy40MmMwLDE0Ljg4LTE4LjEsMTcuNDYtMzAuNjEsMTcuNDZDNzguODMsODMuNDksNDIuNTMsNTMuMjYsNDIuNTMsNDRhNi40Myw2LjQzLDAsMCwxLC4yMi0xLjk0bC0zLjY2LDkuMDZhMTguNDUsMTguNDUsMCwwLDAtMS41MSw3LjMzYzAsMTguMTEsNDEsNDUuNDgsODcuNzQsNDUuNDgsMjAuNjksMCwzNi40My03Ljc2LDM2LjQzLTIxLjc3LDAtMS4wOCwwLTEuOTQtMS43My0xMC4xM1oiLz48cGF0aCBjbGFzcz0iY2xzLTEiIGQ9Ik0xMjcuNDcsODMuNDljMTIuNTEsMCwzMC42MS0yLjU4LDMwLjYxLTE3LjQ2YTE0LDE0LDAsMCwwLS4zMS0zLjQybC03LjQ1LTMyLjM2Yy0xLjcyLTcuMTItMy4yMy0xMC4zNS0xNS43My0xNi42QzEyNC44OSw4LjY5LDEwMy43Ni41LDk3LjUxLjUsOTEuNjkuNSw5MCw4LDgzLjA2LDhjLTYuNjgsMC0xMS42NC01LjYtMTcuODktNS42LTYsMC05LjkxLDQuMDktMTIuOTMsMTIuNSwwLDAtOC40MSwyMy43Mi05LjQ5LDI3LjE2QTYuNDMsNi40MywwLDAsMCw0Mi41Myw0NGMwLDkuMjIsMzYuMywzOS40NSw4NC45NCwzOS40NU0xNjAsNzIuMDdjMS43Myw4LjE5LDEuNzMsOS4wNSwxLjczLDEwLjEzLDAsMTQtMTUuNzQsMjEuNzctMzYuNDMsMjEuNzdDNzguNTQsMTA0LDM3LjU4LDc2LjYsMzcuNTgsNTguNDlhMTguNDUsMTguNDUsMCwwLDEsMS41MS03LjMzQzIyLjI3LDUyLC41LDU1LC41LDc0LjIyYzAsMzEuNDgsNzQuNTksNzAuMjgsMTMzLjY1LDcwLjI4LDQ1LjI4LDAsNTYuNy0yMC40OCw1Ni43LTM2LjY1LDAtMTIuNzItMTEtMjcuMTYtMzAuODMtMzUuNzgiLz48L3N2Zz4= + - base64data: | + PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxOTIgMTQ1Ij48ZGVmcz48c3R5bGU+LmNscy0xe2ZpbGw6I2UwMDt9PC9zdHlsZT48L2RlZnM\+PHRpdGxlPlJlZEhhdC1Mb2dvLUhhdC1Db2xvcjwvdGl0bGU+PHBhdGggZD0iTTE1Ny43Nyw2Mi42MWExNCwxNCwwLDAsMSwuMzEsMy40MmMwLDE0Ljg4LTE4LjEsMTcuNDYtMzAuNjEsMTcuNDZDNzguODMsODMuNDksNDIuNTMsNTMuMjYsNDIuNTMsNDRhNi40Myw2LjQzLDAsMCwxLC4yMi0xLjk0bC0zLjY2LDkuMDZhMTguNDUsMTguNDUsMCwwLDAtMS41MSw3LjMzYzAsMTguMTEsNDEsNDUuNDgsODcuNzQsNDUuNDgsMjAuNjksMCwzNi40My03Ljc2LDM2LjQzLTIxLjc3LDAtMS4wOCwwLTEuOTQtMS43My0xMC4xM1oiLz48cGF0aCBjbGFzcz0iY2xzLTEiIGQ9Ik0xMjcuNDcsODMuNDljMTIuNTEsMCwzMC42MS0yLjU4LDMwLjYxLTE3LjQ2YTE0LDE0LDAsMCwwLS4zMS0zLjQybC03LjQ1LTMyLjM2Yy0xLjcyLTcuMTItMy4yMy0xMC4zNS0xNS43My0xNi42QzEyNC44OSw4LjY5LDEwMy43Ni41LDk3LjUxLjUsOTEuNjkuNSw5MCw4LDgzLjA2LDhjLTYuNjgsMC0xMS42NC01LjYtMTcuODktNS42LTYsMC05LjkxLDQuMDktMTIuOTMsMTIuNSwwLDAtOC40MSwyMy43Mi05LjQ5LDI3LjE2QTYuNDMsNi40MywwLDAsMCw0Mi41Myw0NGMwLDkuMjIsMzYuMywzOS40NSw4NC45NCwzOS40NU0xNjAsNzIuMDdjMS43Myw4LjE5LDEuNzMsOS4wNSwxLjczLDEwLjEzLDAsMTQtMTUuNzQsMjEuNzctMzYuNDMsMjEuNzdDNzguNTQsMTA0LDM3LjU4LDc2LjYsMzcuNTgsNTguNDlhMTguNDUsMTguNDUsMCwwLDEsMS41MS03LjMzQzIyLjI3LDUyLC41LDU1LC41LDc0LjIyYzAsMzEuNDgsNzQuNTksNzAuMjgsMTMzLjY1LDcwLjI4LDQ1LjI4LDAsNTYuNy0yMC40OCw1Ni43LTM2LjY1LDAtMTIuNzItMTEtMjcuMTYtMzAuODMtMzUuNzgiLz48L3N2Zz4= mediatype: image/svg+xml install: spec: diff --git a/config/manifests/kustomization.yaml b/config/manifests/kustomization.yaml index 43c964d6..55a820aa 100644 --- a/config/manifests/kustomization.yaml +++ b/config/manifests/kustomization.yaml @@ -9,8 +9,8 @@ resources: # [WEBHOOK] To enable webhooks, uncomment all the sections with [WEBHOOK] prefix. # Do NOT uncomment sections with prefix [CERTMANAGER], as OLM does not support cert-manager. # These patches remove the unnecessary "cert" volume and its manager container volumeMount. -#patchesJson6902: -#- target: +# patchesJson6902: +# - target: # group: apps # version: v1 # kind: Deployment diff --git a/config/prometheus/monitor.yaml b/config/prometheus/monitor.yaml index 5c85878b..b4ed77ea 100644 --- a/config/prometheus/monitor.yaml +++ b/config/prometheus/monitor.yaml @@ -14,12 +14,12 @@ metadata: namespace: system spec: endpoints: - - path: /metrics - port: https - scheme: https - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token - tlsConfig: - insecureSkipVerify: true + - path: /metrics + port: https + scheme: https + bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token + tlsConfig: + insecureSkipVerify: true selector: matchLabels: control-plane: controller-manager diff --git a/config/rbac/kustomization.yaml b/config/rbac/kustomization.yaml index 69d00392..280c0b62 100644 --- a/config/rbac/kustomization.yaml +++ b/config/rbac/kustomization.yaml @@ -1,19 +1,19 @@ resources: - # All RBAC will be applied under this service account in - # the deployment namespace. You may comment out this resource - # if your manager will use a service account that exists at - # runtime. Be sure to update RoleBinding and ClusterRoleBinding - # subjects if changing service account names. - - service_account.yaml - - role.yaml - - role_binding.yaml - - leader_election_role.yaml - - leader_election_role_binding.yaml +# All RBAC will be applied under this service account in +# the deployment namespace. You may comment out this resource +# if your manager will use a service account that exists at +# runtime. Be sure to update RoleBinding and ClusterRoleBinding +# subjects if changing service account names. +- service_account.yaml +- role.yaml +- role_binding.yaml +- leader_election_role.yaml +- leader_election_role_binding.yaml - # Comment the following 4 lines if you want to disable - # the auth proxy (https://github.com/brancz/kube-rbac-proxy) - # which protects your /metrics endpoint. - - auth_proxy_service.yaml - - auth_proxy_role.yaml - - auth_proxy_role_binding.yaml - - auth_proxy_client_clusterrole.yaml +# Comment the following 4 lines if you want to disable +# the auth proxy (https://github.com/brancz/kube-rbac-proxy) +# which protects your /metrics endpoint. +- auth_proxy_service.yaml +- auth_proxy_role.yaml +- auth_proxy_role_binding.yaml +- auth_proxy_client_clusterrole.yaml diff --git a/config/samples/autoscaling_v1_verticalpodautoscaler.yaml b/config/samples/autoscaling_v1_verticalpodautoscaler.yaml index cd0b6a20..d5381d10 100644 --- a/config/samples/autoscaling_v1_verticalpodautoscaler.yaml +++ b/config/samples/autoscaling_v1_verticalpodautoscaler.yaml @@ -9,13 +9,13 @@ spec: name: myapp-deployment resourcePolicy: containerPolicies: - - containerName: "*" - minAllowed: - cpu: 100m - memory: 50Mi - maxAllowed: - cpu: 1 - memory: 500Mi - controlledResources: - - cpu - - memory + - containerName: "*" + minAllowed: + cpu: 100m + memory: 50Mi + maxAllowed: + cpu: 1 + memory: 500Mi + controlledResources: + - cpu + - memory diff --git a/config/samples/kustomization.yaml b/config/samples/kustomization.yaml index cfc85379..f9f0286a 100644 --- a/config/samples/kustomization.yaml +++ b/config/samples/kustomization.yaml @@ -4,5 +4,5 @@ resources: # including the below commented item will make it appear in the alm-examples annotations in the CSV (and suppress the warning) # but this will make operator-sdk apply the CR when installing the operator, which we don't want # - autoscaling_v1_verticalpodautoscaler.yaml -# -#+kubebuilder:scaffold:manifestskustomizesamples +# +# +kubebuilder:scaffold:manifestskustomizesamples diff --git a/config/scorecard/kustomization.yaml b/config/scorecard/kustomization.yaml index 1bcb4949..23a29f8e 100644 --- a/config/scorecard/kustomization.yaml +++ b/config/scorecard/kustomization.yaml @@ -13,6 +13,6 @@ patches: version: v1alpha3 kind: Configuration name: config -#+kubebuilder:scaffold:patchesJson6902 +# +kubebuilder:scaffold:patchesJson6902 namePrefix: vpa-operator- diff --git a/hack/yaml-lint.sh b/hack/yaml-lint.sh new file mode 100755 index 00000000..981927dc --- /dev/null +++ b/hack/yaml-lint.sh @@ -0,0 +1,15 @@ +#!/bin/sh +if [ "$NO_DOCKER" = "1" ] || [ "$IS_CONTAINER" != "" ]; then + echo "Running yamllint version: $(yamllint --version)..." + yamllint -f colored . +else + podman run --rm \ + --env IS_CONTAINER=TRUE \ + --volume "${PWD}:/data:z" \ + --entrypoint sh \ + docker.io/cytopia/yamllint:alpine \ + ./hack/yaml-lint.sh +fi + +# image from https://hub.docker.com/r/cytopia/yamllint +# repository seems to be dormant now, so latest is version yamllint 1.32.0 until further notice From e971d2f652a87094d298e5921560f863359bc510 Mon Sep 17 00:00:00 2001 From: Max Cao Date: Fri, 30 Aug 2024 16:30:26 -0700 Subject: [PATCH 3/4] Update from 4.17 to 4.18 --- .ci-operator.yaml | 2 +- Dockerfile | 4 ++-- Dockerfile.rhel7 | 4 ++-- Makefile | 6 +++--- bundle/image-references | 2 +- ...utoscaler-operator.clusterserviceversion.yaml | 16 ++++++++-------- ...vertical-pod-autoscaler-operator.package.yaml | 2 +- config/manager/kustomization.yaml | 2 +- ...utoscaler-operator.clusterserviceversion.yaml | 10 +++++----- config/olm-catalog/vpa-catalogsource.yaml | 2 +- hack/e2e.sh | 2 +- hack/manifest-diff-upstream.sh | 2 +- hack/update-vendor.sh | 2 +- internal/operator/config.go | 2 +- 14 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 1e59c02c..64887a08 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: name: release namespace: openshift - tag: rhel-9-release-golang-1.22-openshift-4.17 + tag: rhel-9-release-golang-1.22-openshift-4.18 diff --git a/Dockerfile b/Dockerfile index 6185bce4..e69c1260 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.17 AS builder +FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.18 AS builder ARG TARGETOS ARG TARGETARCH @@ -26,7 +26,7 @@ COPY internal/ internal/ # by leaving it empty we can ensure that the container and binary shipped on it will have the same platform. RUN GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -mod=vendor -a -o manager cmd/main.go -FROM registry.ci.openshift.org/ocp/4.17:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.18:base-rhel9 WORKDIR / COPY --from=builder /workspace/manager . USER 65532:65532 diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7 index d91aeba3..49124807 100644 --- a/Dockerfile.rhel7 +++ b/Dockerfile.rhel7 @@ -1,5 +1,5 @@ # Build the manager binary -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder ARG TARGETOS ARG TARGETARCH @@ -30,7 +30,7 @@ COPY internal/ internal/ # by leaving it empty we can ensure that the container and binary shipped on it will have the same platform. RUN GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -mod=vendor -a -o manager cmd/main.go -FROM registry.ci.openshift.org/ocp/4.17:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.18:base-rhel9 WORKDIR / COPY --from=builder /workspace/manager . USER 65532:65532 diff --git a/Makefile b/Makefile index 8ef1412d..c7b7f9c6 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # Must be semver compliant -export OPERATOR_VERSION ?= 4.17.0 +export OPERATOR_VERSION ?= 4.18.0 OPERATOR_NAME ?= vertical-pod-autoscaler-operator IMAGE_VERSION ?= $(OPERATOR_VERSION) BUNDLE_VERSION ?= $(IMAGE_VERSION) @@ -432,8 +432,8 @@ catalog-push: ## Push a catalog image. ## Optionally, the easiest way to pass IMG arguments is to instead set the following environment variables: ## - IMAGE_TAG_BASE: The base image tag for the operator. ## - OPERATOR_VERSION: The version of the operator. -## e.g. make e2e-olm-local IMAGE_TAG_BASE=quay.io/$(USER)/vertical-pod-autoscaler-operator OPERATOR_VERSION=4.17.0 KUBECONFIG=/path/to/kubeconfig -## This will create OPERATOR_IMG=quay.io/$(IMAGE_TAG_BASE}:4.17.0, BUNDLE_IMG=quay.io/${IMAGE_TAG_BASE}-bundle:4.17.0, and CATALOG_IMG=quay.io/${IMAGE_TAG_BASE}-catalog:4.17.0 +## e.g. make e2e-olm-local IMAGE_TAG_BASE=quay.io/$(USER)/vertical-pod-autoscaler-operator OPERATOR_VERSION=4.18.0 KUBECONFIG=/path/to/kubeconfig +## This will create OPERATOR_IMG=quay.io/$(IMAGE_TAG_BASE}:4.18.0, BUNDLE_IMG=quay.io/${IMAGE_TAG_BASE}-bundle:4.18.0, and CATALOG_IMG=quay.io/${IMAGE_TAG_BASE}-catalog:4.18.0 .PHONY: full-olm-deploy full-olm-deploy: build docker-build docker-push bundle bundle-build bundle-push catalog-build catalog-push deploy-catalog ## Fully deploy the catalog source that contains the operator. Builds and pushes the operator, bundle, and catalog images. Undeploy with 'make undeploy-catalog'. diff --git a/bundle/image-references b/bundle/image-references index 18c8e7df..ecc77706 100644 --- a/bundle/image-references +++ b/bundle/image-references @@ -6,7 +6,7 @@ spec: - name: vertical-pod-autoscaler-rhel8-operator from: kind: DockerImage - name: quay.io/openshift/origin-vertical-pod-autoscaler-operator:4.17.0 + name: quay.io/openshift/origin-vertical-pod-autoscaler-operator:4.18.0 - name: vertical-pod-autoscaler-rhel8 from: kind: DockerImage diff --git a/bundle/manifests/vertical-pod-autoscaler-operator.clusterserviceversion.yaml b/bundle/manifests/vertical-pod-autoscaler-operator.clusterserviceversion.yaml index 713fed5d..272ce35f 100644 --- a/bundle/manifests/vertical-pod-autoscaler-operator.clusterserviceversion.yaml +++ b/bundle/manifests/vertical-pod-autoscaler-operator.clusterserviceversion.yaml @@ -21,8 +21,8 @@ metadata: capabilities: Full Lifecycle categories: OpenShift Optional certifiedLevel: Primed - containerImage: quay.io/openshift/origin-vertical-pod-autoscaler-operator:4.17.0 - createdAt: "2024-08-29T21:23:54Z" + containerImage: quay.io/openshift/origin-vertical-pod-autoscaler-operator:4.18.0 + createdAt: "2024-08-30T23:28:38Z" description: An operator to run the OpenShift Vertical Pod Autoscaler. Vertical Pod Autoscaler (VPA) can be configured to monitor a workload's resource utilization, and then adjust its CPU and memory limits by updating the pod (future) or restarting @@ -38,7 +38,7 @@ metadata: features.operators.openshift.io/token-auth-azure: "false" features.operators.openshift.io/token-auth-gcp: "false" healthIndex: B - olm.skipRange: '>=4.5.0 <4.17.0' + olm.skipRange: '>=4.5.0 <4.18.0' operatorframework.io/initialization-resource: |- { "apiVersion": "autoscaling.openshift.io/v1", @@ -65,7 +65,7 @@ metadata: operatorframework.io/arch.arm64: supported operatorframework.io/arch.ppc64le: supported operatorframework.io/arch.s390x: supported - name: vertical-pod-autoscaler-operator.v4.17.0 + name: vertical-pod-autoscaler-operator.v4.18.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -262,7 +262,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: quay.io/openshift/origin-vertical-pod-autoscaler-operator:4.17.0 + image: quay.io/openshift/origin-vertical-pod-autoscaler-operator:4.18.0 livenessProbe: httpGet: path: /healthz @@ -351,7 +351,7 @@ spec: - scaling labels: olm-owner-enterprise-app: vertical-pod-autoscaler-operator - olm-status-descriptors: vertical-pod-autoscaler-operator.v4.17.0 + olm-status-descriptors: vertical-pod-autoscaler-operator.v4.18.0 links: - name: Vertical Pod Autoscaler Documentation url: https://docs.openshift.com/container-platform/latest/nodes/pods/nodes-pods-vertical-autoscaler.html @@ -365,5 +365,5 @@ spec: relatedImages: - image: quay.io/openshift/origin-vertical-pod-autoscaler:latest name: vpa - replaces: verticalpodautoscaler.v4.16.0 - version: 4.17.0 + replaces: verticalpodautoscaler.v4.17.0 + version: 4.18.0 diff --git a/bundle/vertical-pod-autoscaler-operator.package.yaml b/bundle/vertical-pod-autoscaler-operator.package.yaml index fbf698e0..dfc31e70 100644 --- a/bundle/vertical-pod-autoscaler-operator.package.yaml +++ b/bundle/vertical-pod-autoscaler-operator.package.yaml @@ -2,5 +2,5 @@ packageName: vertical-pod-autoscaler-operator channels: - name: stable - currentCSV: vertical-pod-autoscaler-operator.v4.17.0 + currentCSV: vertical-pod-autoscaler-operator.v4.18.0 defaultChannel: stable diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index dee38972..734d54d3 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -3,7 +3,7 @@ kind: Kustomization images: - name: quay.io/openshift/origin-vertical-pod-autoscaler-operator newName: quay.io/openshift/origin-vertical-pod-autoscaler-operator - newTag: 4.17.0 + newTag: 4.18.0 resources: - manager.yaml patches: diff --git a/config/manifests/bases/vertical-pod-autoscaler-operator.clusterserviceversion.yaml b/config/manifests/bases/vertical-pod-autoscaler-operator.clusterserviceversion.yaml index 1bb62966..a8d899c8 100644 --- a/config/manifests/bases/vertical-pod-autoscaler-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/vertical-pod-autoscaler-operator.clusterserviceversion.yaml @@ -6,7 +6,7 @@ metadata: capabilities: Full Lifecycle categories: OpenShift Optional certifiedLevel: Primed - containerImage: quay.io/openshift/origin-vertical-pod-autoscaler-operator:4.17.0 + containerImage: quay.io/openshift/origin-vertical-pod-autoscaler-operator:4.18.0 createdAt: "2024-07-30T19:27:53Z" description: An operator to run the OpenShift Vertical Pod Autoscaler. Vertical Pod Autoscaler (VPA) can be configured to monitor a workload's resource utilization, @@ -23,7 +23,7 @@ metadata: features.operators.openshift.io/token-auth-azure: "false" features.operators.openshift.io/token-auth-gcp: "false" healthIndex: B - olm.skipRange: '>=4.5.0 <4.17.0' + olm.skipRange: '>=4.5.0 <4.18.0' operatorframework.io/initialization-resource: |- { "apiVersion": "autoscaling.openshift.io/v1", @@ -50,7 +50,7 @@ metadata: operatorframework.io/arch.arm64: supported operatorframework.io/arch.ppc64le: supported operatorframework.io/arch.s390x: supported - name: vertical-pod-autoscaler-operator.v4.17.0 + name: vertical-pod-autoscaler-operator.v4.18.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -132,7 +132,7 @@ spec: - scaling labels: olm-owner-enterprise-app: vertical-pod-autoscaler-operator - olm-status-descriptors: vertical-pod-autoscaler-operator.v4.17.0 + olm-status-descriptors: vertical-pod-autoscaler-operator.v4.18.0 links: - name: Vertical Pod Autoscaler Documentation url: https://docs.openshift.com/container-platform/latest/nodes/pods/nodes-pods-vertical-autoscaler.html @@ -143,5 +143,5 @@ spec: minKubeVersion: 1.11.0 provider: name: Red Hat - replaces: verticalpodautoscaler.v4.16.0 + replaces: verticalpodautoscaler.v4.17.0 version: 0.0.0 diff --git a/config/olm-catalog/vpa-catalogsource.yaml b/config/olm-catalog/vpa-catalogsource.yaml index 72d7f660..1a37e9e0 100644 --- a/config/olm-catalog/vpa-catalogsource.yaml +++ b/config/olm-catalog/vpa-catalogsource.yaml @@ -8,7 +8,7 @@ spec: sourceType: grpc grpcPodConfig: securityContextConfig: restricted - image: quay.io/openshift/origin-vertical-pod-autoscaler-operator-catalog:4.17.0 + image: quay.io/openshift/origin-vertical-pod-autoscaler-operator-catalog:4.18.0 updateStrategy: registryPoll: interval: 10m diff --git a/hack/e2e.sh b/hack/e2e.sh index ceff3d88..70a8ea84 100755 --- a/hack/e2e.sh +++ b/hack/e2e.sh @@ -72,7 +72,7 @@ function await_for_controllers() { # if it exists but is not a git repo, exit # if it does not exist, clone the repo into a temporary directory AUTOSCALER_PKG="github.com/openshift/kubernetes-autoscaler" -RELEASE_VERSION="release-4.17" +RELEASE_VERSION="release-4.18" # check if cached repo exists if [ -d "${AUTOSCALER_TMP:-}" ]; then diff --git a/hack/manifest-diff-upstream.sh b/hack/manifest-diff-upstream.sh index ef6cc4e4..e1c227ba 100755 --- a/hack/manifest-diff-upstream.sh +++ b/hack/manifest-diff-upstream.sh @@ -6,7 +6,7 @@ # can likewise be updated so that the VPA code and manifests stay in sync. # Requires: hack/yamls2list.sed, hack/filter-upstream-rbac.jq, bin/json2yaml, bin/yaml2json -operand_branch="release-4.17" +operand_branch="release-4.18" repo_base="$( dirname "$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )")" repo_name=$(basename "${repo_base}") upstream_manifest_url_prefix="https://raw.githubusercontent.com/openshift/kubernetes-autoscaler/$operand_branch/vertical-pod-autoscaler/deploy" diff --git a/hack/update-vendor.sh b/hack/update-vendor.sh index b7971585..ef2c90f2 100755 --- a/hack/update-vendor.sh +++ b/hack/update-vendor.sh @@ -1,7 +1,7 @@ #!/bin/bash # after changing this value as part of a rebase, run this script to update deps -release_branch="release-4.17" +release_branch="release-4.18" # also update this value. You can see what's available via: go list -mod=readonly -m -versions k8s.io/api | sed 's/ /\n/g' # NOTE: this version should at least be compatible with the current operator-sdk version # See https://sdk.operatorframework.io/docs/overview/#kubernetes-version-compatibility diff --git a/internal/operator/config.go b/internal/operator/config.go index f62a2597..783cb657 100644 --- a/internal/operator/config.go +++ b/internal/operator/config.go @@ -22,7 +22,7 @@ const ( // DefaultVerticalPodAutoscalerImage is the default image used in // VerticalPodAutoscalerController deployments. - DefaultVerticalPodAutoscalerImage = "quay.io/openshift/origin-vertical-pod-autoscaler:4.16.0" + DefaultVerticalPodAutoscalerImage = "quay.io/openshift/origin-vertical-pod-autoscaler:latest" // DefaultVerticalPodAutoscalerVerbosity is the default logging // verbosity level for VerticalPodAutoscalerController deployments. From 718f3cbfdb452ba639c70d6451e0f89a771a0459 Mon Sep 17 00:00:00 2001 From: Max Cao Date: Mon, 2 Sep 2024 16:52:08 -0700 Subject: [PATCH 4/4] Revert operator package and csv name changes This commit reverts the operator package name change from vertical-pod-autoscaler-operator back to vertical-pod-autoscaler. This reason for this change is because package names need to be consistent throughout the lifecycle of an operator through various upgrades. Although this doesn't matter much since ART will apply the correct package name from our bundle/manifests/{VPA}.package.yaml file, this will make it easier to run our upstream upgrade tests. This also reverts the CSV name changes because the Operator-SDK tool does not like it when your package name does not match your csv name and this triggers a lot of unexpected errors, and there doesn't seem to be much merit to applying a bunch of hacks to fix them. --- PROJECT | 2 +- bundle.Dockerfile | 2 +- bundle/art.yaml | 6 +++--- ...l => vertical-pod-autoscaler.clusterserviceversion.yaml} | 4 ++-- bundle/metadata/annotations.yaml | 2 +- bundle/vertical-pod-autoscaler-operator.package.yaml | 4 ++-- ...l => vertical-pod-autoscaler.clusterserviceversion.yaml} | 2 +- config/manifests/kustomization.yaml | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) rename bundle/manifests/{vertical-pod-autoscaler-operator.clusterserviceversion.yaml => vertical-pod-autoscaler.clusterserviceversion.yaml} (99%) rename config/manifests/bases/{vertical-pod-autoscaler-operator.clusterserviceversion.yaml => vertical-pod-autoscaler.clusterserviceversion.yaml} (99%) diff --git a/PROJECT b/PROJECT index f0f1f746..078a9e5d 100644 --- a/PROJECT +++ b/PROJECT @@ -8,7 +8,7 @@ layout: plugins: manifests.sdk.operatorframework.io/v2: {} scorecard.sdk.operatorframework.io/v2: {} -projectName: vertical-pod-autoscaler-operator +projectName: vertical-pod-autoscaler repo: github.com/openshift/vertical-pod-autoscaler-operator resources: - api: diff --git a/bundle.Dockerfile b/bundle.Dockerfile index 7e2afb3d..da285b07 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -4,7 +4,7 @@ FROM scratch LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1 LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/ -LABEL operators.operatorframework.io.bundle.package.v1=vertical-pod-autoscaler-operator +LABEL operators.operatorframework.io.bundle.package.v1=vertical-pod-autoscaler LABEL operators.operatorframework.io.bundle.channels.v1=alpha,beta,stable LABEL operators.operatorframework.io.bundle.channel.default.v1=stable LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.35.0 diff --git a/bundle/art.yaml b/bundle/art.yaml index d1bce2f3..5c347acb 100644 --- a/bundle/art.yaml +++ b/bundle/art.yaml @@ -1,11 +1,11 @@ --- updates: # relative to this file -- file: "manifests/vertical-pod-autoscaler-operator.clusterserviceversion.yaml" +- file: "manifests/vertical-pod-autoscaler.clusterserviceversion.yaml" update_list: # replace metadata.name value - - search: "vertical-pod-autoscaler-operator.v{MAJOR}.{MINOR}.0" - replace: "vertical-pod-autoscaler-operator.v{FULL_VER}" + - search: "vertical-pod-autoscaler.v{MAJOR}.{MINOR}.0" + replace: "vertical-pod-autoscaler.v{FULL_VER}" - search: "version: {MAJOR}.{MINOR}.0" replace: "version: {FULL_VER}" - search: 'olm.skipRange: ">=4.5.0 <{MAJOR}.{MINOR}.0"' diff --git a/bundle/manifests/vertical-pod-autoscaler-operator.clusterserviceversion.yaml b/bundle/manifests/vertical-pod-autoscaler.clusterserviceversion.yaml similarity index 99% rename from bundle/manifests/vertical-pod-autoscaler-operator.clusterserviceversion.yaml rename to bundle/manifests/vertical-pod-autoscaler.clusterserviceversion.yaml index 272ce35f..ac37bee1 100644 --- a/bundle/manifests/vertical-pod-autoscaler-operator.clusterserviceversion.yaml +++ b/bundle/manifests/vertical-pod-autoscaler.clusterserviceversion.yaml @@ -22,7 +22,7 @@ metadata: categories: OpenShift Optional certifiedLevel: Primed containerImage: quay.io/openshift/origin-vertical-pod-autoscaler-operator:4.18.0 - createdAt: "2024-08-30T23:28:38Z" + createdAt: "2024-09-03T17:01:41Z" description: An operator to run the OpenShift Vertical Pod Autoscaler. Vertical Pod Autoscaler (VPA) can be configured to monitor a workload's resource utilization, and then adjust its CPU and memory limits by updating the pod (future) or restarting @@ -65,7 +65,7 @@ metadata: operatorframework.io/arch.arm64: supported operatorframework.io/arch.ppc64le: supported operatorframework.io/arch.s390x: supported - name: vertical-pod-autoscaler-operator.v4.18.0 + name: vertical-pod-autoscaler.v4.18.0 namespace: placeholder spec: apiservicedefinitions: {} diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index 8d499955..2d026be6 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -3,7 +3,7 @@ annotations: operators.operatorframework.io.bundle.mediatype.v1: registry+v1 operators.operatorframework.io.bundle.manifests.v1: manifests/ operators.operatorframework.io.bundle.metadata.v1: metadata/ - operators.operatorframework.io.bundle.package.v1: vertical-pod-autoscaler-operator + operators.operatorframework.io.bundle.package.v1: vertical-pod-autoscaler operators.operatorframework.io.bundle.channels.v1: alpha,beta,stable operators.operatorframework.io.bundle.channel.default.v1: stable operators.operatorframework.io.metrics.builder: operator-sdk-v1.35.0 diff --git a/bundle/vertical-pod-autoscaler-operator.package.yaml b/bundle/vertical-pod-autoscaler-operator.package.yaml index dfc31e70..e90d8bb0 100644 --- a/bundle/vertical-pod-autoscaler-operator.package.yaml +++ b/bundle/vertical-pod-autoscaler-operator.package.yaml @@ -1,6 +1,6 @@ --- -packageName: vertical-pod-autoscaler-operator +packageName: vertical-pod-autoscaler channels: - name: stable - currentCSV: vertical-pod-autoscaler-operator.v4.18.0 + currentCSV: vertical-pod-autoscaler.v4.18.0 defaultChannel: stable diff --git a/config/manifests/bases/vertical-pod-autoscaler-operator.clusterserviceversion.yaml b/config/manifests/bases/vertical-pod-autoscaler.clusterserviceversion.yaml similarity index 99% rename from config/manifests/bases/vertical-pod-autoscaler-operator.clusterserviceversion.yaml rename to config/manifests/bases/vertical-pod-autoscaler.clusterserviceversion.yaml index a8d899c8..9208c960 100644 --- a/config/manifests/bases/vertical-pod-autoscaler-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/vertical-pod-autoscaler.clusterserviceversion.yaml @@ -50,7 +50,7 @@ metadata: operatorframework.io/arch.arm64: supported operatorframework.io/arch.ppc64le: supported operatorframework.io/arch.s390x: supported - name: vertical-pod-autoscaler-operator.v4.18.0 + name: vertical-pod-autoscaler.v4.18.0 namespace: placeholder spec: apiservicedefinitions: {} diff --git a/config/manifests/kustomization.yaml b/config/manifests/kustomization.yaml index 55a820aa..51c23a69 100644 --- a/config/manifests/kustomization.yaml +++ b/config/manifests/kustomization.yaml @@ -1,7 +1,7 @@ # These resources constitute the fully configured set of manifests # used to generate the 'manifests/' directory in a bundle. resources: -- bases/vertical-pod-autoscaler-operator.clusterserviceversion.yaml +- bases/vertical-pod-autoscaler.clusterserviceversion.yaml - ../default - ../samples - ../scorecard