github/open-cluster-management
1
0
Fork 0
mirror of https://github.com/open-cluster-management-io/ocm.git synced 2026-05-14 05:07:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #94 from zhiweiyin318/upgrade-operator-sdk

Browse Source 
upgrade operator-sdk to v1.1.0
This commit is contained in:
OpenShift Merge Robot
2020-11-12 01:44:47 +01:00
committed by GitHub
parent b315f9d1cc 28c2843e6e
commit f58d0a9eb0
3 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@@ -28,7 +28,7 @@ REGISTRATION_TAG?=latest
REGISTRATION_IMAGE?=$(IMAGE_REGISTRY)/registration:$(REGISTRATION_TAG)
OPERATOR_SDK?=$(PERMANENT_TMP_GOPATH)/bin/operator-sdk
OPERATOR_SDK_VERSION?=v1.0.1
OPERATOR_SDK_VERSION?=v1.1.0
operatorsdk_gen_dir:=$(dir $(OPERATOR_SDK))
# On openshift, OLM is installed into openshift-operator-lifecycle-manager
OLM_NAMESPACE?=olm
@@ -73,10 +73,6 @@ update-csv: ensure-operator-sdk
cd deploy/cluster-manager && ../../$(OPERATOR_SDK) generate bundle --manifests --deploy-dir config/ --crds-dir config/crds/ --output-dir olm-catalog/cluster-manager/ --version $(CSV_VERSION)
cd deploy/klusterlet && ../../$(OPERATOR_SDK) generate bundle --manifests --deploy-dir config/ --crds-dir config/crds/ --output-dir olm-catalog/klusterlet/ --version=$(CSV_VERSION)
# TODO: delete this when operator-sdk fix this issue that sets 'null' to array in yaml.
$(SED_CMD) -e "s,rules: null,rules: []," -i deploy/cluster-manager/olm-catalog/cluster-manager/manifests/cluster-manager.clusterserviceversion.yaml
$(SED_CMD) -e "s,rules: null,rules: []," -i deploy/klusterlet/olm-catalog/klusterlet/manifests/klusterlet.clusterserviceversion.yaml
# delete useless serviceaccounts in manifests although they are copied from config by operator-sdk.
rm ./deploy/cluster-manager/olm-catalog/cluster-manager/manifests/cluster-manager_v1_serviceaccount.yaml
rm ./deploy/klusterlet/olm-catalog/klusterlet/manifests/klusterlet_v1_serviceaccount.yaml
@@ -110,7 +106,7 @@ install-olm-kind: ensure-operator-sdk
deploy-hub: deploy-hub-operator apply-hub-cr
deploy-hub-operator: install-olm munge-hub-csv
$(OPERATOR_SDK) run packagemanifests deploy/cluster-manager/olm-catalog/cluster-manager/ --namespace open-cluster-management --version $(CSV_VERSION) --install-mode SingleNamespace=open-cluster-management --timeout=10m
$(OPERATOR_SDK) run packagemanifests deploy/cluster-manager/olm-catalog/cluster-manager/ --namespace open-cluster-management --version $(CSV_VERSION) --install-mode OwnNamespace --timeout=10m
apply-hub-cr:
$(SED_CMD) -e "s,quay.io/open-cluster-management/registration,$(REGISTRATION_IMAGE)," deploy/cluster-manager/config/samples/operator_open-cluster-management_clustermanagers.cr.yaml | $(KUBECTL) apply -f -
@@ -151,7 +147,7 @@ e2e-bootstrap-secret: cluster-ip
deploy-spoke: deploy-spoke-operator apply-spoke-cr
deploy-spoke-operator: install-olm munge-spoke-csv bootstrap-secret
$(OPERATOR_SDK) run packagemanifests deploy/klusterlet/olm-catalog/klusterlet/ --namespace open-cluster-management --version $(CSV_VERSION) --install-mode SingleNamespace=open-cluster-management --timeout=10m
$(OPERATOR_SDK) run packagemanifests deploy/klusterlet/olm-catalog/klusterlet/ --namespace open-cluster-management --version $(CSV_VERSION) --install-mode OwnNamespace --timeout=10m
deploy-spoke-kind: deploy-spoke-operator-kind apply-spoke-cr-kind

5
deploy/cluster-manager/olm-catalog/cluster-manager/manifests/cluster-manager.clusterserviceversion.yaml
View File

@@ -22,7 +22,7 @@ metadata:
containerImage: quay.io/repository/open-cluster-management/registration-operator:latest
createdAt: "2020-10-15T20:00:31Z"
description: Manages the installation and upgrade of the ClusterManager.
operators.operatorframework.io/builder: operator-sdk-v1.0.1
operators.operatorframework.io/builder: operator-sdk-v1.1.0
operators.operatorframework.io/project_layout: go
repository: https://github.com/open-cluster-management/registration-operator
support: Red Hat, Inc.
@@ -256,9 +256,6 @@ spec:
cpu: 100m
memory: 128Mi
serviceAccountName: cluster-manager
permissions:
- rules: []
serviceAccountName: cluster-manager
strategy: deployment
installModes:
- supported: true

5
deploy/klusterlet/olm-catalog/klusterlet/manifests/klusterlet.clusterserviceversion.yaml
View File

@@ -29,7 +29,7 @@ metadata:
containerImage: quay.io/repository/open-cluster-management/registration-operator:latest
createdAt: "2020-10-15T20:00:31Z"
description: Manages the installation and upgrade of the Klusterlet.
operators.operatorframework.io/builder: operator-sdk-v1.0.1
operators.operatorframework.io/builder: operator-sdk-v1.1.0
operators.operatorframework.io/project_layout: go
repository: https://github.com/open-cluster-management/registration-operator
support: Red Hat, Inc.
@@ -257,9 +257,6 @@ spec:
cpu: 100m
memory: 128Mi
serviceAccountName: klusterlet
permissions:
- rules: []
serviceAccountName: klusterlet
strategy: deployment
installModes:
- supported: true