Rebranding OLM Package Name (#57)

m88i · May 12, 2020 · d63c2fb · d63c2fb
1 parent 0b65dc8
commit d63c2fb
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 30 deletions.
diff --git a/bundle.Dockerfile b/bundle.Dockerfile
@@ -3,7 +3,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=nexus-operator
+LABEL operators.operatorframework.io.bundle.package.v1=nexus-operator-m88i
 LABEL operators.operatorframework.io.bundle.channels.v1=alpha
 LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha
 

diff --git a/deploy/olm-catalog/nexus-operator/0.2.0/nexus-operator.v0.2.0.clusterserviceversion.yaml b/deploy/olm-catalog/nexus-operator/0.2.0/nexus-operator.v0.2.0.clusterserviceversion.yaml
@@ -275,5 +275,4 @@ spec:
   minKubeVersion: 1.11.0
   provider:
     name: m88i Labs
-  replaces: nexus-operator.v0.1.0
   version: 0.2.0
diff --git a/deploy/olm-catalog/nexus-operator/manifests/nexus-operator.clusterserviceversion.yaml b/deploy/olm-catalog/nexus-operator/manifests/nexus-operator.clusterserviceversion.yaml
@@ -275,5 +275,4 @@ spec:
   minKubeVersion: 1.11.0
   provider:
     name: m88i Labs
-  replaces: nexus-operator.v0.1.0
   version: 0.2.0
diff --git a/deploy/olm-catalog/nexus-operator/metadata/annotations.yaml b/deploy/olm-catalog/nexus-operator/metadata/annotations.yaml
@@ -4,4 +4,4 @@ annotations:
   operators.operatorframework.io.bundle.manifests.v1: manifests/
   operators.operatorframework.io.bundle.mediatype.v1: registry+v1
   operators.operatorframework.io.bundle.metadata.v1: metadata/
-  operators.operatorframework.io.bundle.package.v1: nexus-operator
+  operators.operatorframework.io.bundle.package.v1: nexus-operator-m88i
diff --git a/deploy/olm-catalog/nexus-operator/nexus-operator-m88i.package.yaml b/deploy/olm-catalog/nexus-operator/nexus-operator-m88i.package.yaml
@@ -0,0 +1,5 @@
+channels:
+  - currentCSV: nexus-operator.v0.2.0
+    name: alpha
+defaultChannel: alpha
+packageName: nexus-operator-m88i
diff --git a/deploy/olm-catalog/nexus-operator/nexus-operator-operatorsource.yaml b/deploy/olm-catalog/nexus-operator/nexus-operator-operatorsource.yaml
diff --git a/deploy/olm-catalog/nexus-operator/nexus-operator.package.yaml b/deploy/olm-catalog/nexus-operator/nexus-operator.package.yaml
diff --git a/hack/ci/operator-ensure-manifest.sh b/hack/ci/operator-ensure-manifest.sh
@@ -25,14 +25,14 @@ echo "Output dir is set to ${OUTPUT}"
 # clean up
 rm -rf "${OUTPUT}"
 
-mkdir -p "${OUTPUT}/nexus-operator/${OP_VERSION}"
-cp "./deploy/olm-catalog/nexus-operator/${OP_VERSION}/"*.yaml "${OUTPUT}/nexus-operator/${OP_VERSION}"
-cp ./deploy/olm-catalog/nexus-operator/nexus-operator.package.yaml "${OUTPUT}/nexus-operator"
+mkdir -p "${OUTPUT}/nexus-operator-m88i/${OP_VERSION}"
+cp "./deploy/olm-catalog/nexus-operator/${OP_VERSION}/"*.yaml "${OUTPUT}/nexus-operator-m88i/${OP_VERSION}"
+cp ./deploy/olm-catalog/nexus-operator/nexus-operator-m88i.package.yaml "${OUTPUT}/nexus-operator-m88i"
 
 # replaces
 replace_version=$(grep replaces "./deploy/olm-catalog/nexus-operator/${OP_VERSION}/nexus-operator.v${OP_VERSION}.clusterserviceversion.yaml" | cut -f2 -d'v')
 if [ ! -z "${replace_version}" ]; then
     echo "Found replaces version in the new CSV: ${replace_version}. Including in the package."
-    mkdir -p "${OUTPUT}/nexus-operator/${replace_version}"
-    cp "./deploy/olm-catalog/nexus-operator/${replace_version}/"*.yaml "${OUTPUT}/nexus-operator/${replace_version}"
+    mkdir -p "${OUTPUT}/nexus-operator-m88i/${replace_version}"
+    cp "./deploy/olm-catalog/nexus-operator/${replace_version}/"*.yaml "${OUTPUT}/nexus-operator-m88i/${replace_version}"
 fi
diff --git a/hack/ci/operator-olm-test.sh b/hack/ci/operator-olm-test.sh
@@ -19,7 +19,7 @@
 source ./hack/ci/operator-ensure-manifest.sh
 
 CATALOG_IMAGE="operatorhubio-catalog:temp"
-OP_PATH="community-operators/nexus-operator"
+OP_PATH="community-operators/nexus-operator-m88i"
 INSTALL_MODE="SingleNamespace"
 OPERATOR_TESTING_IMAGE="quay.io/operator-framework/operator-testing:latest"
 

diff --git a/hack/ci/operator-olm-verify.sh b/hack/ci/operator-olm-verify.sh
@@ -19,7 +19,7 @@
 source ./hack/ci/operator-ensure-manifest.sh
 
 OPERATOR_TESTING_IMAGE="quay.io/operator-framework/operator-testing:latest"
-OP_PATH="community-operators/nexus-operator"
+OP_PATH="community-operators/nexus-operator-m88i"
 
 docker pull ${OPERATOR_TESTING_IMAGE}
 docker run --rm -v ${OUTPUT}:/community-operators:z ${OPERATOR_TESTING_IMAGE} operator.verify --no-print-directory OP_PATH=${OP_PATH} VERBOSE=true
diff --git a/hack/generate-manifests.sh b/hack/generate-manifests.sh
@@ -16,7 +16,6 @@
 #     You should have received a copy of the GNU General Public License
 #     along with Nexus Operator.  If not, see <https://www.gnu.org/licenses/>.
 
-
 source ./hack/export-version.sh
 
 rm ./deploy/olm-catalog/nexus-operator/manifests -rf

diff --git a/hack/olm-integration.sh b/hack/olm-integration.sh
@@ -19,7 +19,7 @@
 source ./hack/export-version.sh
 
 operator-sdk generate csv --apis-dir ./pkg/apis/apps/v1alpha1 --verbose --operator-name nexus-operator --csv-version $OP_VERSION
-operator-sdk bundle create quay.io/m88i/nexus-operator.v${OP_VERSION}:latest  -d ./deploy/olm-catalog/nexus-operator/${OP_VERSION} --package nexus-operator --channels alpha  --overwrite --image-builder podman
+operator-sdk bundle create quay.io/m88i/nexus-operator.v${OP_VERSION}:latest -d ./deploy/olm-catalog/nexus-operator/${OP_VERSION} --package nexus-operator-m88i --channels alpha --overwrite --image-builder podman
 podman push quay.io/m88i/nexus-operator.v${OP_VERSION}:latest
 operator-sdk bundle validate quay.io/m88i/nexus-operator.v${OP_VERSION}:latest
 
@@ -30,4 +30,4 @@ operator-sdk bundle validate quay.io/m88i/nexus-operator.v${OP_VERSION}:latest
 # kubectl apply -f ./examples/nexus3-centos-no-volume.yaml
 # after testing ....
 # operator-sdk cleanup --olm --operator-namespace nexus --operator-version ${VERSION}
-# operator-sdk olm uninstall
+# operator-sdk olm uninstall