feat: CheCluster API v2

.ci/cico_updates_openshift.sh

@@ -15,7 +15,7 @@ set -e
 set -x
 
 export OPERATOR_REPO=$(dirname $(dirname $(readlink -f "$0")));
-source "${OPERATOR_REPO}"/.github/bin/common.sh
+source "${OPERATOR_REPO}/.github/bin/common.sh"
 
 #Stop execution on any error
 trap "catchFinish" EXIT SIGINT

.ci/oci-devworkspace-happy-path.sh

@@ -17,7 +17,7 @@ set -x
 export CHE_REPO_BRANCH="main"
 
 export OPERATOR_REPO=$(dirname $(dirname $(readlink -f "$0")));
-source "${OPERATOR_REPO}"/.github/bin/common.sh
+source "${OPERATOR_REPO}/.github/bin/common.sh"
 source <(curl -s https://raw.githubusercontent.com/eclipse/che/${CHE_REPO_BRANCH}/tests/devworkspace-happy-path/common.sh)
 
 #Stop execution on any error
@@ -29,7 +29,7 @@ overrideDefaults() {
 }
 
 deployChe() {
-  deployEclipseCheOnWithOperator "chectl" "openshift" ${CURRENT_OPERATOR_VERSION_TEMPLATE_PATH} "true"
+  deployEclipseCheWithOperator "chectl" "openshift" ${CURRENT_OPERATOR_VERSION_TEMPLATE_PATH} "true"
 }
 
 initDefaults

.ci/oci-disconnected.sh

@@ -19,7 +19,7 @@ set -o pipefail
 set -u
 
 export OPERATOR_REPO=$(dirname $(dirname $(readlink -f "$0")));
-source "${OPERATOR_REPO}"/.github/bin/common.sh
+source "${OPERATOR_REPO}/.github/bin/common.sh"
 
 # Define Disconnected tests environment
 export INTERNAL_REGISTRY_URL=${INTERNAL_REGISTRY_URL-"UNDEFINED"}

.ci/oci-nightly-update.sh

@@ -20,8 +20,7 @@ set -e
 set -x
 
 export OPERATOR_REPO=$(dirname $(dirname $(readlink -f "$0")));
-source "${OPERATOR_REPO}"/olm/olm.sh
-source "${OPERATOR_REPO}"/.github/bin/common.sh
+source "${OPERATOR_REPO}/.github/bin/common.sh"
 
 #Stop execution on any error
 trap "catchFinish" EXIT SIGINT
@@ -33,7 +32,7 @@ overrideDefaults() {
 
 runTests() {
   deployDevWorkspaceOperator "stable"
-  deployEclipseCheOnWithOperator "chectl" "openshift" ${LAST_OPERATOR_VERSION_TEMPLATE_PATH} "false"
+  deployEclipseCheWithOperator "chectl" "openshift" ${LAST_OPERATOR_VERSION_TEMPLATE_PATH} "false"
   updateEclipseChe "chectl" "openshift" ${CURRENT_OPERATOR_VERSION_TEMPLATE_PATH} "true"
 }
 

.ci/oci-proxy.sh

@@ -19,7 +19,7 @@ set -o pipefail
 set -u
 
 export OPERATOR_REPO=$(dirname $(dirname $(readlink -f "$0")));
-source "${OPERATOR_REPO}"/.github/bin/common.sh
+source "${OPERATOR_REPO}/.github/bin/common.sh"
 
 #Stop execution on any error
 trap "catchFinish" EXIT SIGINT
@@ -29,7 +29,7 @@ overrideDefaults() {
 }
 
 runTests() {
-  deployEclipseCheOnWithOperator "chectl" "openshift" ${CURRENT_OPERATOR_VERSION_TEMPLATE_PATH} "true"
+  deployEclipseCheWithOperator "chectl" "openshift" ${CURRENT_OPERATOR_VERSION_TEMPLATE_PATH} "true"
 }
 
 initDefaults

.ci/oci-single-host.sh

@@ -20,7 +20,7 @@ set -e
 set -x
 
 export OPERATOR_REPO=$(dirname $(dirname $(readlink -f "$0")));
-source "${OPERATOR_REPO}"/.github/bin/common.sh
+source "${OPERATOR_REPO}/.github/bin/common.sh"
 
 #Stop execution on any error
 trap "catchFinish" EXIT SIGINT
@@ -31,12 +31,12 @@ overrideDefaults() {
 }
 
 runTests() {
-  createNamespace ${NAMESPACE}
+  createNamespace "${NAMESPACE}"
 
-  useCustomOperatorImageInCSV ${OPERATOR_IMAGE}
+  useCustomOperatorImageInCSV "${OPERATOR_IMAGE}"
 
-  echo "$(getCheClusterCRFromExistedCSV)" | oc apply -n "${NAMESPACE}" -f -
-  waitEclipseCheDeployed $(getCheVersionFromExistedCSV)
+  getCheClusterCRFromExistedCSV | oc apply -n "${NAMESPACE}" -f -
+  waitEclipseCheDeployed "$(getCheVersionFromExistedCSV)"
 
   waitDevWorkspaceControllerStarted
 }

.github/bin/check-bundle-version.sh

@@ -55,7 +55,7 @@ compareVersions() {
 
   if (( $VERSION_NEW_NUMBER <= $VERSION_CURRENT_NUMBER )); then
     echo "[ERROR] New next bundle version is less than the current one."
-    echo "[ERROR] Please update next bundle with script 'make update-resources -s'"
+    echo "[ERROR] Please update next bundle with script 'make update-dev-resources'"
     exit 1
   fi
 }

.github/bin/check-resources.sh

@@ -11,151 +11,29 @@
 #   Red Hat, Inc. - initial API and implementation
 #
 
-# Checks if repository resources are up to date:
-# - CRDs
-# - next olm bundle
-# - Dockerfile & operator.yaml
-# - DW resources
-# - Helm charts
-
 set -e
 
 ROOT_PROJECT_DIR="${GITHUB_WORKSPACE}"
 if [ -z "${ROOT_PROJECT_DIR}" ]; then
   SCRIPT=$(readlink -f "${BASH_SOURCE[0]}")
-  ROOT_PROJECT_DIR=$(dirname $(dirname $(dirname ${SCRIPT})))
+  ROOT_PROJECT_DIR=$(dirname $(dirname $(dirname "${SCRIPT}")))
 fi
 
-installOperatorSDK() {
-  OPERATOR_SDK_BINARY=$(command -v operator-sdk) || true
-  if [[ ! -x "${OPERATOR_SDK_BINARY}" ]]; then
-    OPERATOR_SDK_TEMP_DIR="$(mktemp -q -d -t "OPERATOR_SDK_XXXXXX" 2>/dev/null || mktemp -q -d)"
-
-    pushd "${ROOT_PROJECT_DIR}" || exit
-    make download-operator-sdk OP_SDK_DIR="${OPERATOR_SDK_TEMP_DIR}"
-    export OPERATOR_SDK_BINARY="${OPERATOR_SDK_TEMP_DIR}/operator-sdk"
-    popd || exit
-  fi
-}
-
-updateResources() {
-  echo "[INFO] Update resources with skipping version incrementation and timestamp..."
-
-  pushd "${ROOT_PROJECT_DIR}" || exit
-  make update-resources NO_DATE_UPDATE="true" NO_INCREMENT="true" -s
-  popd || exit
-}
-
-# check_che_types function check first if api/v1/checluster_types.go file suffer modifications and
-# in case of modification should exist also modifications in config/crd/bases/* folder.
-checkCRDs() {
-    echo "[INFO] Checking CRDs"
-
-    # files to check
-    local checluster_CRD_V1="config/crd/bases/org_v1_che_crd.yaml"
-    local chebackupserverconfiguration_CRD_V1="config/crd/bases/org.eclipse.che_chebackupserverconfigurations_crd.yaml"
-    local checlusterbackup_CRD_V1="config/crd/bases/org.eclipse.che_checlusterbackups_crd.yaml"
-    local checlusterrestore_CRD_V1="config/crd/bases/org.eclipse.che_checlusterrestores_crd.yaml"
-
-    changedFiles=($(cd ${ROOT_PROJECT_DIR}; git diff --name-only))
-    # Check if there are any difference in the crds. If yes, then fail check.
-    if [[ " ${changedFiles[*]} " =~ $checluster_CRD_V1 ]] || \
-       [[ " ${changedFiles[*]} " =~ $chebackupserverconfiguration_CRD_V1 ]] || \
-       [[ " ${changedFiles[*]} " =~ $checlusterbackup_CRD_V1 ]] || \
-       [[ " ${changedFiles[*]} " =~ $checlusterrestore_CRD_V1 ]]
-    then
-        echo "[ERROR] CRD file is not up to date: ${BASH_REMATCH}"
-        echo "[ERROR] Run 'make update-resources -s' to regenerate CRD files."
-        exit 1
-    else
-        echo "[INFO] CRDs files are up to date."
-    fi
-}
-
-checkNextOlmBundle() {
-  # files to check
-  local CSV_OPENSHIFT="bundle/next/eclipse-che-preview-openshift/manifests"
-
-  changedFiles=($(cd ${ROOT_PROJECT_DIR}; git diff --name-only))
-  if [[ " ${changedFiles[*]} " =~ $CSV_OPENSHIFT ]]; then
-    echo "[ERROR] Nighlty bundle is not up to date: ${BASH_REMATCH}"
-    echo "[ERROR] Run 'make update-resources -s' to regenerate next bundle files."
-    exit 1
-  else
-    echo "[INFO] Next bundles are up to date."
-  fi
-}
-
-checkDockerfile() {
-  # files to check
-  local Dockerfile="Dockerfile"
-
-  changedFiles=($(cd ${ROOT_PROJECT_DIR}; git diff --name-only))
-  if [[ " ${changedFiles[*]} " =~ $Dockerfile ]]; then
-    echo "[ERROR] Dockerfile is not up to date"
-    echo "[ERROR] Run 'make update-resources -s' to update Dockerfile"
-    exit 1
-  else
-    echo "[INFO] Dockerfile is up to date."
-  fi
-}
-
-checkOperatorYaml() {
-  # files to check
-  local managerYaml="config/manager/manager.yaml"
-
-  changedFiles=($(cd ${ROOT_PROJECT_DIR}; git diff --name-only))
-  if [[ " ${changedFiles[*]} " =~ $managerYaml ]]; then
-    echo "[ERROR] $managerYaml is not up to date"
-    echo "[ERROR] Run 'make update-resources -s' to update $managerYaml"
-    exit 1
-  else
-    echo "[INFO] $managerYaml is up to date."
-  fi
-}
-
-checkRoles() {
-  # files to check
-  local RoleYaml="config/rbac/role.yaml"
-  local ClusterRoleYaml="config/rbac/cluster_role.yaml"
-
-  changedFiles=(
-    $(git diff --name-only)
-  )
-  if [[ " ${changedFiles[*]} " =~ $RoleYaml ]] || [[ " ${changedFiles[*]} " =~ $ClusterRoleYaml ]]; then
-    echo "[ERROR] Roles are not up to date: ${BASH_REMATCH}"
-    echo "[ERROR] Run 'make update-resources -s' to update them."
-    exit 1
-  else
-    echo "[INFO] Roles are up to date."
-  fi
-}
-
-checkHelmCharts() {
-  changedFiles=(
-    $(git diff --name-only)
-  )
-  if [[ " ${changedFiles[*]} " =~ helmcharts ]]; then
-    echo "[ERROR] Helm Charts are not up to date"
-    echo "[ERROR] Run 'make update-resources -s' to update them."
-    exit 1
-  else
-    echo "[INFO] Helm Charts are up to date."
-  fi
-}
+pushd "${ROOT_PROJECT_DIR}" || true
 
-installOperatorSDK
+# Update resources
+make update-dev-resources INCREMENT_BUNDLE_VERSION=false
 
-pushd "${ROOT_PROJECT_DIR}" || true
+if [[ $(git diff --name-only | wc -l) != 0 ]]; then
+  # Print difference
+  git --no-pager diff
 
-updateResources
-checkCRDs
-checkRoles
-checkNextOlmBundle
-checkDockerfile
-checkOperatorYaml
-checkHelmCharts
+  echo "[ERROR] Resources are not up to date."
+  echo "[ERROR] Run 'make update-dev-resources' to update them."
+  exit 1
+else
+  echo "[INFO] Done."
+fi
 
 popd || true
 
-echo "[INFO] Done."