Skip to content

Commit

Permalink
bump csv to 0.13.0 (#290)
Browse files Browse the repository at this point in the history
Signed-off-by: Zhiwei Yin <zyin@redhat.com>
  • Loading branch information
zhiweiyin318 authored Oct 10, 2023
1 parent 495e4cb commit 5903140
Show file tree
Hide file tree
Showing 14 changed files with 1,893 additions and 28 deletions.
10 changes: 6 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@ include $(addprefix ./vendor/github.com/openshift/build-machinery-go/make/, \
)

OPERATOR_SDK?=$(PERMANENT_TMP_GOPATH)/bin/operator-sdk
OPERATOR_SDK_VERSION?=v1.28.0
OPERATOR_SDK_VERSION?=v1.32.0
operatorsdk_gen_dir:=$(dir $(OPERATOR_SDK))
# CSV_VERSION is used to generate new CSV manifests
CSV_VERSION?=0.12.0
CSV_VERSION?=0.13.0
export CSV_VERSION

OPERATOR_SDK_ARCHOS:=linux_amd64
ifeq ($(GOHOSTOS),darwin)
Expand Down Expand Up @@ -54,8 +55,8 @@ copy-crd:
update: copy-crd update-csv

update-csv: ensure-operator-sdk
cd deploy/cluster-manager && ../../$(OPERATOR_SDK) generate bundle --version $(CSV_VERSION) --package cluster-manager --input-dir config --output-dir olm-catalog/cluster-manager
cd deploy/klusterlet && ../../$(OPERATOR_SDK) generate bundle --version $(CSV_VERSION) --package klusterlet --input-dir config --output-dir olm-catalog/klusterlet
cd deploy/cluster-manager && ../../$(OPERATOR_SDK) generate bundle --version $(CSV_VERSION) --package cluster-manager --channels stable --default-channel stable --input-dir config --output-dir olm-catalog/cluster-manager
cd deploy/klusterlet && ../../$(OPERATOR_SDK) generate bundle --version $(CSV_VERSION) --package klusterlet --channels stable --default-channel stable --input-dir config --output-dir olm-catalog/klusterlet

# delete bundle.Dockerfile since we do not use it to build image.
rm ./deploy/cluster-manager/bundle.Dockerfile
Expand Down Expand Up @@ -99,3 +100,4 @@ endif
# Include the integration/e2e setup makefile.
include ./test/integration-test.mk
include ./test/e2e-test.mk
include ./test/olm-test.mk
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ spec:
```
$ kubectl get pods -n open-cluster-management-hub
NAME READY STATUS RESTARTS AGE
cluster-manager-addon-manager-controller-7fcc67bfdf-x7hbz 1/1 Running 0 61m
cluster-manager-placement-controller-dbcfd4975-26jpw 1/1 Running 0 61m
cluster-manager-registration-controller-7949d97899-wwtg4 1/1 Running 0 61m
cluster-manager-registration-webhook-7f675bc4bb-v4rhj 1/1 Running 0 61m
Expand Down Expand Up @@ -69,7 +70,7 @@ spec:
- ClusterManager
links:
- name: Registration Operator
url: https://github.com/open-cluster-management-io/registration-operator
url: https://github.com/open-cluster-management-io/ocm
maintainers:
- email: zyin@redhat.com
name: Zhiwei Yin
Expand All @@ -80,8 +81,8 @@ spec:
maturity: alpha
provider:
name: Red Hat, Inc.
replaces: cluster-manager.v0.11.0
replaces: cluster-manager.v0.12.0
selector:
matchLabels:
app: cluster-manager
version: 0.12.0
version: 0.13.0

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
channels:
- name: stable
currentCSV: cluster-manager.v0.12.0
currentCSV: cluster-manager.v0.13.0
defaultChannel: stable
packageName: cluster-manager
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@ metadata:
categories: Integration & Delivery,OpenShift Optional
certified: "false"
containerImage: quay.io/open-cluster-management/registration-operator:latest
createdAt: "2023-09-25T08:57:25Z"
createdAt: "2023-10-10T01:17:41Z"
description: Manages the installation and upgrade of the ClusterManager.
operators.operatorframework.io/builder: operator-sdk-v1.28.0
operators.operatorframework.io/builder: operator-sdk-v1.32.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
repository: https://github.com/open-cluster-management-io/registration-operator
support: Red Hat, Inc.
name: cluster-manager.v0.12.0
name: cluster-manager.v0.13.0
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand All @@ -88,6 +88,7 @@ spec:
```
$ kubectl get pods -n open-cluster-management-hub
NAME READY STATUS RESTARTS AGE
cluster-manager-addon-manager-controller-7fcc67bfdf-x7hbz 1/1 Running 0 61m
cluster-manager-placement-controller-dbcfd4975-26jpw 1/1 Running 0 61m
cluster-manager-registration-controller-7949d97899-wwtg4 1/1 Running 0 61m
cluster-manager-registration-webhook-7f675bc4bb-v4rhj 1/1 Running 0 61m
Expand Down Expand Up @@ -586,7 +587,7 @@ spec:
- ClusterManager
links:
- name: Registration Operator
url: https://github.com/open-cluster-management-io/registration-operator
url: https://github.com/open-cluster-management-io/ocm
maintainers:
- email: zyin@redhat.com
name: Zhiwei Yin
Expand All @@ -597,8 +598,8 @@ spec:
maturity: alpha
provider:
name: Red Hat, Inc.
replaces: cluster-manager.v0.11.0
replaces: cluster-manager.v0.12.0
selector:
matchLabels:
app: cluster-manager
version: 0.12.0
version: 0.13.0
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ annotations:
operators.operatorframework.io.bundle.manifests.v1: manifests/
operators.operatorframework.io.bundle.metadata.v1: metadata/
operators.operatorframework.io.bundle.package.v1: cluster-manager
operators.operatorframework.io.bundle.channels.v1: alpha
operators.operatorframework.io.metrics.builder: operator-sdk-v1.28.0
operators.operatorframework.io.bundle.channels.v1: stable
operators.operatorframework.io.bundle.channel.default.v1: stable
operators.operatorframework.io.metrics.builder: operator-sdk-v1.32.0
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ spec:
- Klusterlet
links:
- name: Registration Operator
url: https://github.com/open-cluster-management-io/registration-operator
url: https://github.com/open-cluster-management-io/ocm
maintainers:
- email: zyin@redhat.com
name: Zhiwei Yin
Expand All @@ -87,8 +87,8 @@ spec:
maturity: alpha
provider:
name: Red Hat, Inc.
replaces: klusterlet.v0.11.0
replaces: klusterlet.v0.12.0
selector:
matchLabels:
app: klusterlet
version: 0.12.0
version: 0.13.0

Large diffs are not rendered by default.

Loading

0 comments on commit 5903140

Please sign in to comment.