Release version 7.17.1 (#407)

* Update defaults tags to 7.17.1 Signed-off-by: Mykhailo Kuznietsov <[email protected]> * Release OLM files to 7.17.1 Signed-off-by: Mykhailo Kuznietsov <[email protected]> * Fix testing changes using olm on minikube (#400) Signed-off-by: Anatolii Bazko <[email protected]> * Use fixed operator marketplace tag instead of latest. (#404) Signed-off-by: Oleksandr Andriienko <[email protected]> Co-authored-by: Mykhailo Kuznietsov <[email protected]> Co-authored-by: Anatolii Bazko <[email protected]> Co-authored-by: Oleksandr Andriienko <[email protected]>
eclipse-che · Aug 19, 2020 · ded7a5a · ded7a5a
1 parent d108ee8
commit ded7a5a
Show file tree

Hide file tree

Showing 13 changed files with 5,504 additions and 22 deletions.
diff --git a/deploy/operator-local.yaml b/deploy/operator-local.yaml
@@ -25,7 +25,7 @@ spec:
       serviceAccountName: che-operator
       containers:
         - name: che-operator
-          image: quay.io/eclipse/che-operator:7.17.0
+          image: quay.io/eclipse/che-operator:7.17.1
           ports:
             - containerPort: 60000
               name: metrics
@@ -44,21 +44,21 @@ spec:
             - name: OPERATOR_NAME
               value: che-operator
             - name: CHE_VERSION
-              value: 7.17.0
+              value: 7.17.1
             - name: RELATED_IMAGE_che_server
-              value: quay.io/eclipse/che-server:7.17.0
+              value: quay.io/eclipse/che-server:7.17.1
             - name: RELATED_IMAGE_plugin_registry
-              value: quay.io/eclipse/che-plugin-registry:7.17.0
+              value: quay.io/eclipse/che-plugin-registry:7.17.1
             - name: RELATED_IMAGE_devfile_registry
-              value: quay.io/eclipse/che-devfile-registry:7.17.0
+              value: quay.io/eclipse/che-devfile-registry:7.17.1
             - name: RELATED_IMAGE_che_tls_secrets_creation_job
               value: quay.io/eclipse/che-tls-secret-creator:alpine-3029769
             - name: RELATED_IMAGE_pvc_jobs
               value: registry.access.redhat.com/ubi8-minimal:8.2-345
             - name: RELATED_IMAGE_postgres
               value: centos/postgresql-96-centos7:9.6
             - name: RELATED_IMAGE_keycloak
-              value: quay.io/eclipse/che-keycloak:7.17.0
+              value: quay.io/eclipse/che-keycloak:7.17.1
             - name: RELATED_IMAGE_che_workspace_plugin_broker_metadata
               value: quay.io/eclipse/che-plugin-metadata-broker:v3.2.0
             - name: RELATED_IMAGE_che_workspace_plugin_broker_artifacts

diff --git a/deploy/operator.yaml b/deploy/operator.yaml
@@ -24,7 +24,7 @@ spec:
     spec:
       containers:
         - name: che-operator
-          image: quay.io/eclipse/che-operator:7.17.0
+          image: quay.io/eclipse/che-operator:7.17.1
           ports:
             - containerPort: 60000
               name: metrics
@@ -43,21 +43,21 @@ spec:
             - name: OPERATOR_NAME
               value: che-operator
             - name: CHE_VERSION
-              value: 7.17.0
+              value: 7.17.1
             - name: RELATED_IMAGE_che_server
-              value: quay.io/eclipse/che-server:7.17.0
+              value: quay.io/eclipse/che-server:7.17.1
             - name: RELATED_IMAGE_plugin_registry
-              value: quay.io/eclipse/che-plugin-registry:7.17.0
+              value: quay.io/eclipse/che-plugin-registry:7.17.1
             - name: RELATED_IMAGE_devfile_registry
-              value: quay.io/eclipse/che-devfile-registry:7.17.0
+              value: quay.io/eclipse/che-devfile-registry:7.17.1
             - name: RELATED_IMAGE_che_tls_secrets_creation_job
               value: quay.io/eclipse/che-tls-secret-creator:alpine-3029769
             - name: RELATED_IMAGE_pvc_jobs
               value: registry.access.redhat.com/ubi8-minimal:8.2-345
             - name: RELATED_IMAGE_postgres
               value: centos/postgresql-96-centos7:9.6
             - name: RELATED_IMAGE_keycloak
-              value: quay.io/eclipse/che-keycloak:7.17.0
+              value: quay.io/eclipse/che-keycloak:7.17.1
             - name: RELATED_IMAGE_che_workspace_plugin_broker_metadata
               value: quay.io/eclipse/che-plugin-metadata-broker:v3.2.0
             - name: RELATED_IMAGE_che_workspace_plugin_broker_artifacts

diff --git a/...olm-catalog/eclipse-che-preview-kubernetes/7.17.1/eclipse-che-preview-kubernetes.crd.yaml b/...olm-catalog/eclipse-che-preview-kubernetes/7.17.1/eclipse-che-preview-kubernetes.crd.yaml
diff --git a/...atalog/eclipse-che-preview-kubernetes/7.17.1/eclipse-che-preview-kubernetes.crd.yaml.diff b/...atalog/eclipse-che-preview-kubernetes/7.17.1/eclipse-che-preview-kubernetes.crd.yaml.diff
diff --git a/...eview-kubernetes/7.17.1/eclipse-che-preview-kubernetes.v7.17.1.clusterserviceversion.yaml b/...eview-kubernetes/7.17.1/eclipse-che-preview-kubernetes.v7.17.1.clusterserviceversion.yaml
diff --git a/...-kubernetes/7.17.1/eclipse-che-preview-kubernetes.v7.17.1.clusterserviceversion.yaml.diff b/...-kubernetes/7.17.1/eclipse-che-preview-kubernetes.v7.17.1.clusterserviceversion.yaml.diff
diff --git a/...oy/olm-catalog/eclipse-che-preview-kubernetes/eclipse-che-preview-kubernetes.package.yaml b/...oy/olm-catalog/eclipse-che-preview-kubernetes/eclipse-che-preview-kubernetes.package.yaml
@@ -1,7 +1,7 @@
 channels:
 - currentCSV: eclipse-che-preview-kubernetes.v9.9.9-nightly.1596725014
   name: nightly
-- currentCSV: eclipse-che-preview-kubernetes.v7.17.0
+- currentCSV: eclipse-che-preview-kubernetes.v7.17.1
   name: stable
 defaultChannel: stable
 packageName: eclipse-che-preview-kubernetes
diff --git a/...y/olm-catalog/eclipse-che-preview-openshift/7.17.1/eclipse-che-preview-openshift.crd.yaml b/...y/olm-catalog/eclipse-che-preview-openshift/7.17.1/eclipse-che-preview-openshift.crd.yaml
diff --git a/...-catalog/eclipse-che-preview-openshift/7.17.1/eclipse-che-preview-openshift.crd.yaml.diff b/...-catalog/eclipse-che-preview-openshift/7.17.1/eclipse-che-preview-openshift.crd.yaml.diff
diff --git a/...preview-openshift/7.17.1/eclipse-che-preview-openshift.v7.17.1.clusterserviceversion.yaml b/...preview-openshift/7.17.1/eclipse-che-preview-openshift.v7.17.1.clusterserviceversion.yaml
diff --git a/...ew-openshift/7.17.1/eclipse-che-preview-openshift.v7.17.1.clusterserviceversion.yaml.diff b/...ew-openshift/7.17.1/eclipse-che-preview-openshift.v7.17.1.clusterserviceversion.yaml.diff
diff --git a/...ploy/olm-catalog/eclipse-che-preview-openshift/eclipse-che-preview-openshift.package.yaml b/...ploy/olm-catalog/eclipse-che-preview-openshift/eclipse-che-preview-openshift.package.yaml
@@ -1,7 +1,7 @@
 channels:
 - currentCSV: eclipse-che-preview-openshift.v9.9.9-nightly.1596725015
   name: nightly
-- currentCSV: eclipse-che-preview-openshift.v7.17.0
+- currentCSV: eclipse-che-preview-openshift.v7.17.1
   name: stable
 defaultChannel: stable
 packageName: eclipse-che-preview-openshift
diff --git a/olm/olm.sh b/olm/olm.sh
@@ -115,15 +115,20 @@ EOF
     marketplaceNamespace="openshift-marketplace";
     applyCheOperatorSource
   else
-    curl -sL https://github.com/operator-framework/operator-lifecycle-manager/releases/download/0.14.1/install.sh | bash -s 0.14.1
-    kubectl apply -f https://raw.githubusercontent.com/operator-framework/operator-marketplace/master/deploy/upstream/01_namespace.yaml
-    kubectl apply -f https://raw.githubusercontent.com/operator-framework/operator-marketplace/master/deploy/upstream/03_operatorsource.crd.yaml
-    kubectl apply -f https://raw.githubusercontent.com/operator-framework/operator-marketplace/master/deploy/upstream/04_service_account.yaml
-    kubectl apply -f https://raw.githubusercontent.com/operator-framework/operator-marketplace/master/deploy/upstream/05_role.yaml
-    kubectl apply -f https://raw.githubusercontent.com/operator-framework/operator-marketplace/master/deploy/upstream/06_role_binding.yaml
+    OLM_VERSION=0.15.1
+    MARKETPLACE_VERSION=4.5
+    OPERATOR_MARKETPLACE_VERSION="release-${MARKETPLACE_VERSION}"
+    curl -sL https://github.com/operator-framework/operator-lifecycle-manager/releases/download/${OLM_VERSION}/install.sh | bash -s ${OLM_VERSION}
+    kubectl apply -f https://raw.githubusercontent.com/operator-framework/operator-marketplace/${OPERATOR_MARKETPLACE_VERSION}/deploy/upstream/01_namespace.yaml
+    kubectl apply -f https://raw.githubusercontent.com/operator-framework/operator-marketplace/${OPERATOR_MARKETPLACE_VERSION}/deploy/upstream/03_operatorsource.crd.yaml
+    kubectl apply -f https://raw.githubusercontent.com/operator-framework/operator-marketplace/${OPERATOR_MARKETPLACE_VERSION}/deploy/upstream/04_service_account.yaml
+    kubectl apply -f https://raw.githubusercontent.com/operator-framework/operator-marketplace/${OPERATOR_MARKETPLACE_VERSION}/deploy/upstream/05_role.yaml
+    kubectl apply -f https://raw.githubusercontent.com/operator-framework/operator-marketplace/${OPERATOR_MARKETPLACE_VERSION}/deploy/upstream/06_role_binding.yaml
     sleep 1
-    kubectl apply -f https://raw.githubusercontent.com/operator-framework/operator-marketplace/master/deploy/upstream/07_upstream_operatorsource.cr.yaml
-    kubectl apply -f https://raw.githubusercontent.com/operator-framework/operator-marketplace/master/deploy/upstream/08_operator.yaml
+    kubectl apply -f https://raw.githubusercontent.com/operator-framework/operator-marketplace/${OPERATOR_MARKETPLACE_VERSION}/deploy/upstream/07_upstream_operatorsource.cr.yaml
+    curl -sL https://raw.githubusercontent.com/operator-framework/operator-marketplace/${OPERATOR_MARKETPLACE_VERSION}/deploy/upstream/08_operator.yaml | \
+    sed -e "s;quay.io/openshift/origin-operator-marketplace:latest;quay.io/openshift/origin-operator-marketplace:${MARKETPLACE_VERSION};" | \
+    kubectl apply -f -
 
     applyCheOperatorSource