Olm bundles for stable channel

.github/bin/check-nightly-olm-bundle.sh

@@ -58,10 +58,10 @@ installOperatorSDK() {
 }
 
 checkNightlyOlmBundle() {
-  local CSV_FILE_KUBERNETES="deploy/olm-catalog/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml"
-  local CSV_FILE_OPENSHIFT="deploy/olm-catalog/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml"
-  local CRD_FILE_KUBERNETES="deploy/olm-catalog/eclipse-che-preview-kubernetes/manifests/org_v1_che_crd.yaml"
-  local CRD_FILE_OPENSHIFT="deploy/olm-catalog/eclipse-che-preview-openshift/manifests/org_v1_che_crd.yaml"
+  local CSV_FILE_KUBERNETES="deploy/olm-catalog/nightly/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml"
+  local CSV_FILE_OPENSHIFT="deploy/olm-catalog/nightly/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml"
+  local CRD_FILE_KUBERNETES="deploy/olm-catalog/nightly/eclipse-che-preview-kubernetes/manifests/org_v1_che_crd.yaml"
+  local CRD_FILE_OPENSHIFT="deploy/olm-catalog/nightly/eclipse-che-preview-openshift/manifests/org_v1_che_crd.yaml"
 
   export NO_DATE_UPDATE="true"
   export NO_INCREMENT="true"

.github/bin/common.sh

@@ -52,28 +52,27 @@ initDefaults() {
 
 initOpenShiftDefaults() {
   export OAUTH="true"
-  export OPENSHIFT_NIGHTLY_CSV_FILE="${OPERATOR_REPO}/deploy/olm-catalog/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml"
+  export OPENSHIFT_NIGHTLY_CSV_FILE="${OPERATOR_REPO}/deploy/olm-catalog/nightly/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml"
 }
 
 initLatestTemplates() {
   cp -rf ${OPERATOR_REPO}/deploy/* "${TEMPLATES}/che-operator"
 }
 
 initStableTemplates() {
-  local platform=$1
-  local channel=$2
-
   # Get Stable and new release versions from olm files openshift.
-  export packageName=eclipse-che-preview-${platform}
-  export platformPath=${OPERATOR_REPO}/olm/${packageName}
-  export packageFolderPath="${platformPath}/deploy/olm-catalog/${packageName}"
-  export packageFilePath="${packageFolderPath}/${packageName}.package.yaml"
-
-  export lastCSV=$(yq -r ".channels[] | select(.name == \"${channel}\") | .currentCSV" "${packageFilePath}")
-  export LAST_PACKAGE_VERSION=$(echo "${lastCSV}" | sed -e "s/${packageName}.v//")
-
-  export previousCSV=$(sed -n 's|^ *replaces: *\([^ ]*\) *|\1|p' "${packageFolderPath}/${LAST_PACKAGE_VERSION}/${packageName}.v${LAST_PACKAGE_VERSION}.clusterserviceversion.yaml")
-  export PREVIOUS_PACKAGE_VERSION=$(echo "${previousCSV}" | sed -e "s/${packageName}.v//")
+  versions=$(curl \
+  -H "Authorization: bearer ${GITHUB_TOKEN}" \
+  -X POST -H "Content-Type: application/json" --data \
+  '{"query": "{ repository(owner: \"eclipse\", name: \"che-operator\") { refs(refPrefix: \"refs/tags/\", last: 2, orderBy: {field: TAG_COMMIT_DATE, direction: ASC}) { edges { node { name } } } } }" } ' \
+  https://api.github.com/graphql)
+
+  echo "${versions[*]}"
+
+  LAST_PACKAGE_VERSION=$(echo "${versions[@]}" | jq '.data.repository.refs.edges[1].node.name | sub("\""; "")' | tr -d '"')
+  export LAST_PACKAGE_VERSION
+  PREVIOUS_PACKAGE_VERSION=$(echo "${versions[@]}" | jq '.data.repository.refs.edges[0].node.name | sub("\""; "")' | tr -d '"')
+  export PREVIOUS_PACKAGE_VERSION
 
   export lastOperatorPath=${OPERATOR_REPO}/tmp/${LAST_PACKAGE_VERSION}
   export previousOperatorPath=${OPERATOR_REPO}/tmp/${PREVIOUS_PACKAGE_VERSION}

.github/bin/minikube/test-olm.sh

@@ -13,14 +13,18 @@ set -x
 
 # Get absolute path for root repo directory from github actions context: https://docs.github.com/en/free-pro-team@latest/actions/reference/context-and-expression-syntax-for-github-actions
 export OPERATOR_REPO="${GITHUB_WORKSPACE}"
+if [ -z "${OPERATOR_REPO}" ]; then
+  SCRIPT=$(readlink -f "${BASH_SOURCE[0]}")
+  OPERATOR_REPO=$(dirname "$(dirname "$(dirname "$(dirname "$SCRIPT")")")")
+fi
 source "${OPERATOR_REPO}"/.github/bin/common.sh
 
 # Stop execution on any error
 trap "catchFinish" EXIT SIGINT
 
 runTest() {
   export OPERATOR_IMAGE="${IMAGE_REGISTRY_HOST}/operator:test"
-  source "${OPERATOR_REPO}"/olm/testCatalogSource.sh "kubernetes" "nightly" ${NAMESPACE} "catalog"
+  source "${OPERATOR_REPO}"/olm/testCatalogSource.sh "kubernetes" "nightly" "${NAMESPACE}"
   startNewWorkspace
   waitWorkspaceStart
 }

.github/bin/minikube/test-operator-update.sh

@@ -15,6 +15,10 @@ set -x
 
 # Get absolute path for root repo directory from github actions context: https://docs.github.com/en/free-pro-team@latest/actions/reference/context-and-expression-syntax-for-github-actions
 export OPERATOR_REPO="${GITHUB_WORKSPACE}"
+if [ -z "${OPERATOR_REPO}" ]; then
+  SCRIPT=$(readlink -f "${BASH_SOURCE[0]}")
+  OPERATOR_REPO=$(dirname "$(dirname "$(dirname "$(dirname "$SCRIPT")")")")
+fi
 source "${OPERATOR_REPO}"/.github/bin/common.sh
 
 # Stop execution on any error

.github/workflows/push-catalog-and-bundle-images.yaml → .github/workflows/build-and-push-catalog-and-bundle-images.yaml

@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2012-2020 Red Hat, Inc.
+#  Copyright (c) 2012-2021 Red Hat, Inc.
 #    This program and the accompanying materials are made
 #    available under the terms of the Eclipse Public License 2.0
 #    which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -9,27 +9,35 @@
 #  Contributors:
 #    Red Hat, Inc. - initial API and implementation
 #
-name: Push catalog and bundle images.
+name: Build and push catalog and bundle images.
 on:
   schedule:
     - cron:  '0 21 * * *'
       branches:
         - master
 jobs:
 
-  build:
+  build-and-push-images:
     name: Build
     runs-on: ubuntu-20.04
 
     steps:
     - uses: actions/checkout@v1
 
+    - name: Install yq
+      run: sudo pip install yq
+
     - name: Docker login
       uses: azure/docker-login@v1
       with:
         login-server: quay.io
         username: ${{ secrets.QUAY_USERNAME }}
         password: ${{ secrets.QUAY_PASSWORD }}
 
-    - name: Build catalog source and opm bundle images and push
-      run: "${GITHUB_WORKSPACE}/.github/bin/push-catalog-and-bundle-images.sh"
+    - name: Build catalog source and opm bundle images and push to registry
+      run: >
+        ${GITHUB_WORKSPACE}/olm/buildAndPushBundleImages.sh -c 'nightly' -p 'openshift' &&
+        ${GITHUB_WORKSPACE}/olm/buildAndPushBundleImages.sh -c 'nightly' -p 'kubernetes'  
+      env:
+        IMAGE_REGISTRY_HOST: quay.io
+        IMAGE_REGISTRY_USER_NAME: eclipse

.github/workflows/migrate-old-manifest-packages-to-bundles.yaml

@@ -0,0 +1,44 @@
+#
+# Copyright (c) 2012-2021 Red Hat, Inc.
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#   Red Hat, Inc. - initial API and implementation
+
+name: Migrate manifest format packages to the OLM bundles
+
+# on: [push]
+on:
+  schedule:
+    - cron:  '35 18 * * *'
+jobs:
+
+  build:
+    name: Bundle migration
+    runs-on: ubuntu-20.04
+
+    steps:
+    - uses: actions/checkout@v1
+
+    - name: TIME
+      run: date +"%H:%M"
+
+    - name: Install yq
+      run: sudo pip install yq
+
+    - name: Docker login
+      uses: azure/docker-login@v1
+      with:
+        login-server: quay.io
+        username: ${{ secrets.QUAY_USERNAME }}
+        password: ${{ secrets.QUAY_PASSWORD }}
+
+    - name: Migrate manifest format packages to the OLM bundles
+      run: "${GITHUB_WORKSPACE}/olm/buildOLMBundlesFromReleaseManifestFiles.sh"
+      env:
+        IMAGE_REGISTRY_HOST: quay.io
+        IMAGE_REGISTRY_USER_NAME: eclipse

.github/workflows/minikube-operator-update.yaml

@@ -37,6 +37,8 @@ jobs:
       run: bash <(curl -sL https://www.eclipse.org/che/chectl/) --channel=stable
     - name: Tests
       run: /bin/bash .github/bin/minikube/test-operator-update.sh
+      env:
+        "GITHUB_TOKEN": "${{ secrets.GITHUB_TOKEN }}"
     # Run this step even the previous step fail
     - uses: actions/upload-artifact@v2
       if: ${{ always() }}

.github/workflows/minishift-operator-update.yaml

@@ -53,6 +53,8 @@ jobs:
       run: |
         eval $(minishift oc-env)
         /bin/bash .github/bin/minishift/test-operator-update.sh
+      env:
+        "GITHUB_TOKEN": "${{ secrets.GITHUB_TOKEN }}"
     # Run this step even the previous step fail
     - uses: actions/upload-artifact@v2
       if: ${{ always() }}

.github/workflows/release-che-docs.yml

@@ -16,7 +16,7 @@ on:
     branches: 
       - master
     paths:
-      - 'olm/eclipse-che-preview-*/deploy/olm-catalog/eclipse-che-preview-*/eclipse-che-preview-*.package.yaml'
+      - 'deploy/olm-catalog/stable/eclipse-che-preview-*/manifests/che-operator.clusterserviceversion.yaml'
 
 jobs:
   build:
@@ -34,7 +34,7 @@ jobs:
           set -e
           # if not run manually, need to compute che docs version from latest released CSV
           if [[ "${{ github.event.inputs.version }}" == "" ]] || [[ "${{ github.event.inputs.version }}" == "7.y.z" ]]; then
-            chedocsVersion=$(yq -r '.channels[].currentCSV' olm/eclipse-che-preview-openshift/deploy/olm-catalog/eclipse-che-preview-openshift/eclipse-che-preview-openshift.package.yaml | sed -e "s#eclipse-che-preview-openshift.v##")
+            chedocsVersion=$(yq -r '.spec.version' deploy/olm-catalog/stable/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml")
           else
             chedocsVersion="${{ github.event.inputs.version }}"
           fi

.github/workflows/release-chectl.yml

@@ -16,7 +16,7 @@ on:
     branches: 
       - master
     paths:
-      - 'olm/eclipse-che-preview-*/deploy/olm-catalog/eclipse-che-preview-*/eclipse-che-preview-*.package.yaml'
+      - 'deploy/olm-catalog/stable/eclipse-che-preview-*/manifests/che-operator.clusterserviceversion.yaml'
 
 jobs:
   build:
@@ -34,7 +34,7 @@ jobs:
           set -e
           # if not run manually, need to compute chectl version from latest released CSV
           if [[ "${{ github.event.inputs.version }}" == "" ]] || [[ "${{ github.event.inputs.version }}" == "7.y.z" ]]; then
-            chectlVersion=$(yq -r '.channels[].currentCSV' olm/eclipse-che-preview-openshift/deploy/olm-catalog/eclipse-che-preview-openshift/eclipse-che-preview-openshift.package.yaml | sed -e "s#eclipse-che-preview-openshift.v##")
+            chectlVersion=$(yq -r '.spec.version' deploy/olm-catalog/stable/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml")
           else
             chectlVersion="${{ github.event.inputs.version }}"
           fi

.github/workflows/release-community-operator-PRs.yml

@@ -12,7 +12,7 @@ on:
     branches: 
       - master
     paths:
-      - 'olm/eclipse-che-preview-*/deploy/olm-catalog/eclipse-che-preview-*/eclipse-che-preview-*.package.yaml'
+      - 'deploy/olm-catalog/stable/eclipse-che-preview-*/manifests/che-operator.clusterserviceversion.yaml'
 
 jobs:
   build:

.github/workflows/release.yml

@@ -30,6 +30,7 @@ jobs:
           python -m pip install --upgrade pip
           pip install operator-courier==2.1.7
           pip install yq
+          pip install semver
           # get base32 util from che-release project
           wget https://raw.githubusercontent.com/eclipse/che-release/master/utils/base32
           # copy base32 python-based helper script into dir that's accessed from PATH (so it's accessible to this and other called scripts) 
@@ -38,6 +39,9 @@ jobs:
           #remove base32 from current directory to avoid it being commited during release
           rm $(pwd)/base32 
       - name: Release operator
+        env:
+          IMAGE_REGISTRY_HOST: quay.io
+          IMAGE_REGISTRY_USER_NAME: eclipse
         run: |
           CHE_VERSION=${{ github.event.inputs.version }}
           echo "CHE_VERSION=${CHE_VERSION}"
@@ -83,7 +87,7 @@ jobs:
           # https://quay.io/application/eclipse-che-operator-kubernetes/eclipse-che-preview-kubernetes?tab=releases and
           # https://quay.io/application/eclipse-che-operator-openshift/eclipse-che-preview-openshift?tab=releases
           git checkout ${CHE_VERSION}-release
-          ./make-release.sh ${CHE_VERSION} --push-olm-files
+          ./make-release.sh ${CHE_VERSION} --push-olm-bundles
 
           # perform extra checkouts to ensure branches exist locally
           git checkout ${BRANCH}

.gitignore

@@ -109,7 +109,9 @@ tags
 
 build/
 olm/generated
-deploy/olm-catalog/eclipse-che-preview-kubernetes/generated
-deploy/olm-catalog/eclipse-che-preview-openshift/generated
+deploy/olm-catalog/nightly/eclipse-che-preview-kubernetes/generated
+deploy/olm-catalog/nightly/eclipse-che-preview-openshift/generated
+deploy/olm-catalog/stable/eclipse-che-preview-kubernetes/generated
+deploy/olm-catalog/stable/eclipse-che-preview-openshift/generated
 
 # End of https://www.gitignore.io/api/go,vim,emacs,visualstudiocode