seg_yinzy
/
che-operator
mirror of https://github.com/eclipse-che/che-operator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: Migrate from sql-based to file-based catalog source format (#1559) 

chore: Migrate from sql-based to file-based catalog source format 

Signed-off-by: Anatolii Bazko <abazko@redhat.com>
pull/1561/head
Anatolii Bazko 2022-11-16 15:00:09 +02:00 committed by GitHub
parent 0d5efc4d7b
commit 7bc4194e0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
101 changed files with 1082 additions and 878 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
.ci/cico_updates_openshift.sh
View File

@ -1,26 +0,0 @@
#!/bin/bash
#
# Copyright (c) 2019-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
#
set -ex
export OPERATOR_REPO=$(dirname $(dirname $(readlink -f "$0")));
source "${OPERATOR_REPO}/build/scripts/oc-tests/oc-common.sh"
#Stop execution on any error
trap "catchFinish" EXIT SIGINT
runTests() {
. "${OPERATOR_REPO}"/build/scripts/olm/testUpdate.sh -c stable -i quay.io/eclipse/eclipse-che-openshift-opm-catalog:test -n ${NAMESPACE} --verbose
}
runTests

5
.github/workflows/build-next-images.yaml vendored
View File

@ -19,8 +19,9 @@ on:
reason:
description: 'Reason to trigger a build'
required: false
schedule:
- cron: '0 0 * * *'
push:
branches:
- main
jobs:
build-images:
runs-on: ubuntu-20.04

25
.github/workflows/build-catalog-and-bundle-images.yaml → .github/workflows/release-next-catalog.yaml vendored
View File

@ -10,7 +10,7 @@
# Red Hat, Inc. - initial API and implementation
#
name: Build catalog images
name: Release next catalog
on:
# manual trigger if required
workflow_dispatch:
@ -18,12 +18,11 @@ on:
reason:
description: 'Reason to trigger a build'
required: false
schedule:
- cron: '0 21 * * *'
branches:
- main
push:
branches:
- main
jobs:
build-images:
release-next-catalog:
name: Build
runs-on: ubuntu-20.04
steps:
@ -36,8 +35,14 @@ jobs:
login-server: quay.io
username: ${{ secrets.QUAY_USERNAME }}
password: ${{ secrets.QUAY_PASSWORD }}
- name: Build and push images to quay.io
- name: Release next catalog
run: |
${GITHUB_WORKSPACE}/build/scripts/olm/buildCatalog.sh \
--channel 'next' \
--catalog-image quay.io/eclipse/eclipse-che-openshift-opm-catalog:next
git config --global user.name "Anatolii Bazko"
git config --global user.email "abazko@redhat.com"
export GITHUB_TOKEN=${{ secrets.CHE_BOT_GITHUB_TOKEN }}
${GITHUB_WORKSPACE}/build/scripts/olm/release-catalog.sh --channel 'next' --catalog-image quay.io/eclipse/eclipse-che-olm-catalog:next
git add -A olm-catalog/next
git commit -m "chore(catalog): release "
git push origin main

4
.gitignore vendored
View File

@ -113,8 +113,8 @@ tags
.history
build/scripts/release/generated
bundle/next/eclipse-che-preview-openshift/generated
bundle/stable/eclipse-che-preview-openshift/generated
bundle/next/eclipse-che/generated
bundle/stable/eclipse-che/generated
testbin/setup-envtest.sh

76
Makefile
View File

@ -87,7 +87,7 @@ else
OPERATOR_NAMESPACE ?= "eclipse-che"
endif
ECLIPSE_CHE_PACKAGE_NAME="eclipse-che-preview-openshift"
ECLIPSE_CHE_PACKAGE_NAME=eclipse-che
CHECLUSTER_CR_PATH="$(PROJECT_DIR)/config/samples/org_v2_checluster.yaml"
CHECLUSTER_CRD_PATH="$(PROJECT_DIR)/config/crd/bases/org.eclipse.che_checlusters.yaml"
@ -434,7 +434,7 @@ bundle: generate manifests download-kustomize download-operator-sdk ## Generate
# Copy bundle.Dockerfile to the bundle dir
# Update paths (since it is created in the root of the project) and labels
mv bundle.Dockerfile $${BUNDLE_PATH}
sed -i 's|$(PROJECT_DIR)/bundle/$(CHANNEL)/eclipse-che-preview-openshift/||' $${BUNDLE_PATH}/bundle.Dockerfile
sed -i 's|$(PROJECT_DIR)/bundle/$(CHANNEL)/$(ECLIPSE_CHE_PACKAGE_NAME)/||' $${BUNDLE_PATH}/bundle.Dockerfile
printf "\nLABEL com.redhat.openshift.versions=\"v4.8\"" >> $${BUNDLE_PATH}/bundle.Dockerfile
# Update annotations.yaml correspondingly to bundle.Dockerfile
@ -466,59 +466,73 @@ bundle: generate manifests download-kustomize download-operator-sdk ## Generate
$(MAKE) license $$(find $${BUNDLE_PATH} -name "*.yaml")
$(OPERATOR_SDK) bundle validate $${BUNDLE_PATH}
$(OPERATOR_SDK) bundle validate $${BUNDLE_PATH} --select-optional name=operatorhub --optional-values=k8s-version=1.19
.PHONY: bundle-build
bundle-build: SHELL := /bin/bash
bundle-build: ## Build a bundle image
bundle-build: download-opm ## Build a bundle image
[[ -z "$(CHANNEL)" ]] && { echo [ERROR] CHANNEL not defined; exit 1; }
[[ -z "$(BUNDLE_IMG)" ]] && { echo [ERROR] BUNDLE_IMG not defined; exit 1; }
BUNDLE_DIR="$(PROJECT_DIR)/bundle/$(CHANNEL)/$(ECLIPSE_CHE_PACKAGE_NAME)"
pushd $${BUNDLE_DIR}
$(IMAGE_TOOL) build -f bundle.Dockerfile -t $(BUNDLE_IMG) .
popd
BUNDLE_PATH=$$($(MAKE) bundle-path)
$(IMAGE_TOOL) build -f $${BUNDLE_PATH}/bundle.Dockerfile -t $(BUNDLE_IMG) $${BUNDLE_PATH}
.PHONY: bundle-push
bundle-push: SHELL := /bin/bash
bundle-push: ## Push a bundle image
[[ -z "$(BUNDLE_IMG)" ]] && { echo [ERROR] BUNDLE_IMG not defined; exit 1; }
$(MAKE) docker-push IMG=$(BUNDLE_IMG)
$(IMAGE_TOOL) push $(BUNDLE_IMG)
bundle-render: SHELL := /bin/bash
bundle-render: download-opm ## Add bundle to a catalog
[[ -z "$(CHANNEL)" ]] && { echo [ERROR] CHANNEL not defined; exit 1; }
[[ -z "$(BUNDLE_NAME)" ]] && { echo [ERROR] BUNDLE_NAME not defined; exit 1; }
[[ -z "$(BUNDLE_IMG)" ]] && { echo [ERROR] BUNDLE_IMG not defined; exit 1; }
[[ -z "$(CATALOG_DIR)" ]] && DEFINED_CATALOG_DIR=$$($(MAKE) catalog-path) || DEFINED_CATALOG_DIR=$(CATALOG_DIR)
$(OPM) render $(BUNDLE_IMG) -o yaml --skip-tls-verify | sed 's|---||g' > $${DEFINED_CATALOG_DIR}/$(BUNDLE_NAME).bundle.yaml
# Build a catalog image by adding bundle images to an empty catalog using the operator package manager tool, 'opm'.
# This recipe invokes 'opm' in 'semver' bundle add mode. For more information on add modes, see:
# https://github.com/operator-framework/community-operators/blob/7f1438c/docs/packaging-operator.md#updating-your-existing-operator
.PHONY: catalog-build
catalog-build: SHELL := /bin/bash
catalog-build: download-opm ## Build a catalog image
[[ -z "$(BUNDLE_IMG)" ]] && { echo [ERROR] BUNDLE_IMG not defined; exit 1; }
[[ -z "$(CHANNEL)" ]] && { echo [ERROR] CHANNEL not defined; exit 1; }
[[ -z "$(CATALOG_IMG)" ]] && { echo [ERROR] CATALOG_IMG not defined; exit 1; }
$(OPM) index add \
--build-tool $(IMAGE_TOOL) \
--bundles $(BUNDLE_IMG) \
--tag $(CATALOG_IMG) \
--pull-tool $(IMAGE_TOOL) \
--binary-image=quay.io/operator-framework/upstream-opm-builder:v1.15.2 \
--mode semver $(FROM_INDEX_OPT)
$(OPM) validate olm-catalog/$(CHANNEL)
$(IMAGE_TOOL) build -f olm-catalog/index.Dockerfile -t $(CATALOG_IMG) --build-arg CHANNEL=$(CHANNEL) .
.PHONY: catalog-push
catalog-push: SHELL := /bin/bash
catalog-push: ## Push a catalog image
[[ -z "$(CATALOG_IMG)" ]] && { echo [ERROR] CATALOG_IMG not defined; exit 1; }
$(MAKE) docker-push IMG=$(CATALOG_IMG)
$(IMAGE_TOOL) push $(CATALOG_IMG)
bundle-path: SHELL := /bin/bash
bundle-path: ## Prints path to a bundle directory for a given channel
[[ -z "$(CHANNEL)" ]] && { echo [ERROR] CHANNEL not defined; exit 1; }
echo "$(PROJECT_DIR)/bundle/$(CHANNEL)/$(ECLIPSE_CHE_PACKAGE_NAME)"
catalog-path: SHELL := /bin/bash
catalog-path: ## Prints path to a catalog directory for a given channel
[[ -z "$(CHANNEL)" ]] && { echo [ERROR] CHANNEL not defined; exit 1; }
echo "$(PROJECT_DIR)/olm-catalog/$(CHANNEL)"
channel-path: SHELL := /bin/bash
channel-path: ## Prints path to a channel.yaml
[[ -z "$(CHANNEL)" ]] && { echo [ERROR] CHANNEL not defined; exit 1; }
echo "$(PROJECT_DIR)/olm-catalog/$(CHANNEL)/channel.yaml"
csv-path: SHELL := /bin/bash
csv-path: ## Prints path to a clusterserviceversion file for a given channel
[[ -z "$(CHANNEL)" ]] && { echo [ERROR] CHANNEL not defined; exit 1; }
BUNDLE_PATH=$$($(MAKE) bundle-path)
echo "$${BUNDLE_PATH}/manifests/che-operator.clusterserviceversion.yaml"
bundle-name: SHELL := /bin/bash
bundle-name: ## Prints a clusterserviceversion name for a given channel
[[ -z "$(CHANNEL)" ]] && { echo [ERROR] CHANNEL not defined; exit 1; }
CSV_PATH=$$($(MAKE) csv-path)
echo $$(yq -r ".metadata.name" "$${CSV_PATH}")
bundle-version: SHELL := /bin/bash
bundle-version: ## Prints a bundle version for a given channel
[[ -z "$(CHANNEL)" ]] && { echo [ERROR] CHANNEL not defined; exit 1; }
@ -528,7 +542,9 @@ bundle-version: ## Prints a bundle version for a given channel
##@ Utilities
OPM ?= $(shell pwd)/bin/opm
download-opm: SHELL := /bin/bash
download-opm: ## Download opm tool
[[ -z "$(DEST)" ]] && dest=$(OPM) || dest=$(DEST)/opm
command -v $(OPM) >/dev/null 2>&1 && exit
OS=$(shell go env GOOS)
@ -537,9 +553,9 @@ download-opm: ## Download opm tool
echo "[INFO] Downloading opm version: $${OPM_VERSION}"
mkdir -p $$(dirname "$(OPM)")
curl -sL https://github.com/operator-framework/operator-registry/releases/download/$${OPM_VERSION}/$${OS}-$${ARCH}-opm > $(OPM)
chmod +x $(OPM)
mkdir -p $$(dirname "$${dest}")
curl -sL https://github.com/operator-framework/operator-registry/releases/download/$${OPM_VERSION}/$${OS}-$${ARCH}-opm > $${dest}
chmod +x $${dest}
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
download-controller-gen: ## Download controller-gen tool
@ -616,13 +632,17 @@ create-catalogsource: SHELL := /bin/bash
create-catalogsource: ## Creates catalog source
[[ -z "$(NAME)" ]] && { echo [ERROR] NAME not defined; exit 1; }
[[ -z "$(IMAGE)" ]] && { echo [ERROR] IMAGE not defined; exit 1; }
[[ -z "$(NAMESPACE)" ]] && DEFINED_NAMESPACE="openshift-marketplace" || DEFINED_NAMESPACE=$(NAMESPACE)
echo '{
"apiVersion": "operators.coreos.com/v1alpha1",
"kind": "CatalogSource",
"metadata": {
"name": "$(NAME)",
"namespace": "openshift-marketplace"
"namespace": "'$${DEFINED_NAMESPACE}'",
"labels": {
"app.kubernetes.io/part-of": "che.eclipse.org"
}
},
"spec": {
"sourceType": "grpc",
@ -638,7 +658,7 @@ create-catalogsource: ## Creates catalog source
}' | $(K8S_CLI) apply -f -
sleep 20s
$(K8S_CLI) wait --for=condition=ready pod -l "olm.catalogSource=$(NAME)" -n openshift-marketplace --timeout=240s
$(K8S_CLI) wait --for=condition=ready pod -l "olm.catalogSource=$(NAME)" -n $${DEFINED_NAMESPACE} --timeout=240s
create-operatorgroup: SHELL := /bin/bash
create-operatorgroup: ## Creates operator group
@ -650,7 +670,7 @@ create-operatorgroup: ## Creates operator group
"kind": "OperatorGroup",
"metadata": {
"name": "$(NAME)",
"namespace": "'$${NAMESPACE}'"
"namespace": "$(NAMESPACE)"
},
"spec": {}
}' | $(K8S_CLI) apply -f -

2
README.md
View File

@ -76,7 +76,7 @@ make docker-build docker-push IMG=<YOUR_OPERATOR_IMAGE>
For OpenShift cluster:
```bash
build/scripts/olm/testCatalogFromSources.sh -o <YOUR_OPERATOR_IMAGE>
build/scripts/olm/test-catalog-from-sources.sh
```
For Kubernetes cluster:

2
REQUIREMENTS
View File

@ -1,2 +1,2 @@
operator-sdk: v1.9.2
opm: v1.15.1
opm: v1.26.2

2
api/v1/zz_generated.deepcopy.go
View File

@ -1,7 +1,7 @@
// +build !ignore_autogenerated
//
// Copyright (c) 2019-2021 Red Hat, Inc.
// Copyright (c) 2019-2022 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/

2
api/v2/zz_generated.deepcopy.go
View File

@ -1,7 +1,7 @@
// +build !ignore_autogenerated
//
// Copyright (c) 2019-2021 Red Hat, Inc.
// Copyright (c) 2019-2022 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/

4
build/scripts/check-bundle-version.sh
View File

@ -15,8 +15,8 @@ set -e
OPERATOR_REPO=$(dirname "$(dirname "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")")")
CSV_OPENSHIFT_NEXT_NEW="bundle/next/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml"
CSV_OPENSHIFT_NEXT_CURRENT=https://raw.githubusercontent.com/eclipse-che/che-operator/main/bundle/next/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml
CSV_OPENSHIFT_NEXT_NEW="bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml"
CSV_OPENSHIFT_NEXT_CURRENT=https://raw.githubusercontent.com/eclipse-che/che-operator/main/bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml
compareBundleVersions() {
git remote add operator https://github.com/eclipse-che/che-operator.git

23
build/scripts/oc-tests/oc-common.sh
View File

@ -12,12 +12,10 @@
#
export NAMESPACE="eclipse-che"
export BUNDLE_NAME="che-bundle"
export ARTIFACTS_DIR=${ARTIFACT_DIR:-"/tmp/artifacts-che"}
export ECLIPSE_CHE_STABLE_PACKAGE_NAME="eclipse-che"
export ECLIPSE_CHE_PREVIEW_PACKAGE_NAME="eclipse-che-preview-openshift"
export ECLIPSE_CHE_CATALOG_SOURCE_NAME="eclipse-che-custom-catalog-source"
export ECLIPSE_CHE_SUBSCRIPTION_NAME="eclipse-che-subscription"
export ECLIPSE_CHE_PACKAGE_NAME="eclipse-che"
export ECLIPSE_CHE_CATALOG_SOURCE_NAME="eclipse-che"
export ECLIPSE_CHE_SUBSCRIPTION_NAME="eclipse-che"
catchFinish() {
local RESULT=$?
@ -32,7 +30,7 @@ catchFinish() {
}
waitForRemovedEclipseCheSubscription() {
while [[ $(oc get subscription -A -o json | jq -r '.items | .[] | select(.spec.name == "'${ECLIPSE_CHE_PREVIEW_PACKAGE_NAME}'" or .spec.name == "'${ECLIPSE_CHE_STABLE_PACKAGE_NAME}'")') != "" ]]; do
while [[ $(oc get subscription -A -o json | jq -r '.items | .[] | select(.spec.name == "'${ECLIPSE_CHE_PACKAGE_NAME}'")') != "" ]]; do
sleep 5s
done
}
@ -54,13 +52,15 @@ getCheVersionFromInstalledCSV() {
}
discoverEclipseCheSubscription() {
ECLIPSE_CHE_SUBSCRIPTION_RECORD=$(oc get subscription -A -o json | jq -r '.items | .[] | select(.spec.name == "'${ECLIPSE_CHE_PREVIEW_PACKAGE_NAME}'" or .spec.name == "'${ECLIPSE_CHE_STABLE_PACKAGE_NAME}'")')
ECLIPSE_CHE_SUBSCRIPTION_RECORD=$(oc get subscription -A -o json | jq -r '.items | .[] | select(.spec.name == "'${ECLIPSE_CHE_PACKAGE_NAME}'")')
ECLIPSE_CHE_SUBSCRIPTION_NAME=$(echo ${ECLIPSE_CHE_SUBSCRIPTION_RECORD} | jq -r '.metadata.name')
ECLIPSE_CHE_SUBSCRIPTION_NAMESPACE=$(echo ${ECLIPSE_CHE_SUBSCRIPTION_RECORD} | jq -r '.metadata.namespace')
ECLIPSE_CHE_INSTALLED_CSV=$(echo ${ECLIPSE_CHE_SUBSCRIPTION_RECORD} | jq -r '.status.installedCSV')
}
discoverEclipseCheBundles() {
local OPENSHIFT_VERSION=$(oc version -o json | yq -r '.openshiftVersion')
local CHANNEL=$1
local CATALOG_SERVICE=$(oc get service ${ECLIPSE_CHE_CATALOG_SOURCE_NAME} -n openshift-marketplace -o yaml)
local REGISTRY_IP=$(echo "${CATALOG_SERVICE}" | yq -r ".spec.clusterIP")
@ -68,10 +68,15 @@ discoverEclipseCheBundles() {
local xFlag="+x"; [[ $- =~ x ]] && xFlag="-x"
set +x # suppress output
local POD_OVERRIDES='{"apiVersion": "v1", "spec": {"securityContext": {"allowPrivilegeEscalation": false, "runAsNonRoot": true, "capabilities": {"drop": ["ALL"]}, "seccompProfile": {"type": "RuntimeDefault"}}}}'
[[ ${OPENSHIFT_VERSION} =~ ^4[.]10 ]] && POD_OVERRIDES=''
local BUNDLES=$(oc run grpcurl-query -n openshift-marketplace \
--rm=true \
--restart=Never \
--attach=true \
--overrides="${POD_OVERRIDES}" \
--image=docker.io/fullstorydev/grpcurl:v1.7.0 \
-- -plaintext "${REGISTRY_IP}:${CATALOG_PORT}" api.Registry.ListBundles | head -n -1)
@ -84,8 +89,8 @@ discoverEclipseCheBundles() {
export LATEST_VERSION="next"
export PREVIOUS_VERSION="next"
else
export LATEST_VERSION=${LATEST_CSV_NAME#${ECLIPSE_CHE_PREVIEW_PACKAGE_NAME}.v}
export PREVIOUS_VERSION=${PREVIOUS_CSV_NAME#${ECLIPSE_CHE_PREVIEW_PACKAGE_NAME}.v}
export LATEST_VERSION=${LATEST_CSV_NAME#${ECLIPSE_CHE_PACKAGE_NAME}.v}
export PREVIOUS_VERSION=${PREVIOUS_CSV_NAME#${ECLIPSE_CHE_PACKAGE_NAME}.v}
fi
echo "[INFO] PREVIOUS_CSV_NAME: ${PREVIOUS_CSV_NAME}"

1
build/scripts/oc-tests/oc-test-happy-path.sh
View File

@ -23,6 +23,7 @@ source "${OPERATOR_REPO}/build/scripts/oc-tests/oc-common.sh"
trap "catchFinish" EXIT SIGINT
runTests() {
. ${OPERATOR_REPO}/build/scripts/olm/test-catalog-from-sources.sh --verbose
bash <(curl -s ${DEVWORKSPACE_HAPPY_PATH}/remote-launch.sh)
}

5
build/scripts/oc-tests/oc-test-operator.sh
View File

@ -14,15 +14,12 @@
set -ex
export OPERATOR_REPO=$(dirname "$(dirname "$(dirname "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")")")")
source "${OPERATOR_REPO}/build/scripts/oc-tests/oc-common.sh"
# Stop execution on any error
trap "catchFinish" EXIT SIGINT
[[ -z "${CI_CHE_OPERATOR_IMAGE}" ]] && { echo "[ERROR] CI_CHE_OPERATOR_IMAGE not defined"; exit 1; }
runTests() {
. ${OPERATOR_REPO}/build/scripts/olm/testCatalogFromSources.sh -o ${CI_CHE_OPERATOR_IMAGE} --verbose
. "${OPERATOR_REPO}/build/scripts/olm/test-catalog-from-sources.sh" --verbose
}
runTests

8
build/scripts/oc-tests/oc-test-upgrade-from-stable-to-next.sh
View File

@ -24,10 +24,6 @@ source "${OPERATOR_REPO}/build/scripts/oc-tests/oc-common.sh"
#Stop execution on any error
trap "catchFinish" EXIT SIGINT
unset OPERATOR_TEST_NAMESPACE
[[ -z "${CI_CHE_OPERATOR_IMAGE}" ]] && { echo "[ERROR] CI_CHE_OPERATOR_IMAGE not defined"; exit 1; }
# Uninstall Eclipse Che stable version operator by deleting its subscription
deleteEclipseCheStableVersionOperator() {
discoverEclipseCheSubscription
@ -43,9 +39,9 @@ deleteEclipseCheStableVersionOperator() {
}
runTests() {
. ${OPERATOR_REPO}/build/scripts/olm/testCatalog.sh -i quay.io/eclipse/eclipse-che-openshift-opm-catalog:test -c stable --verbose
. ${OPERATOR_REPO}/build/scripts/olm/test-catalog.sh -i quay.io/eclipse/eclipse-che-olm-catalog:stable -c stable --verbose
deleteEclipseCheStableVersionOperator
. ${OPERATOR_REPO}/build/scripts/olm/testCatalogFromSources.sh -o ${CI_CHE_OPERATOR_IMAGE} --verbose
. ${OPERATOR_REPO}/build/scripts/olm/test-catalog-from-sources.sh --verbose
}
runTests

2
build/scripts/oc-tests/oc-test-upgrade-from-stable-to-stable.sh
View File

@ -20,7 +20,7 @@ source "${OPERATOR_REPO}/build/scripts/oc-tests/oc-common.sh"
trap "catchFinish" EXIT SIGINT
runTests() {
. ${OPERATOR_REPO}/build/scripts/olm/testUpdate.sh -c stable -i quay.io/eclipse/eclipse-che-openshift-opm-catalog:test -n ${NAMESPACE} --verbose
. "${OPERATOR_REPO}/build/scripts/olm/test-update.sh" -c stable -i quay.io/eclipse/eclipse-che-olm-catalog:stable --verbose
}
runTests

141
build/scripts/olm/buildCatalog.sh
View File

@ -1,141 +0,0 @@
#!/bin/bash
#
# Copyright (c) 2019-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
#
set -e
OPERATOR_REPO=$(dirname "$(dirname "$(dirname "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")")")")
source "${OPERATOR_REPO}/build/scripts/oc-tests/oc-common.sh"
init() {
FORCE="false"
IMAGE_TOOL="docker"
CHANNEL="next"
unset CATALOG_IMAGE
unset OPERATOR_IMAGE
while [[ "$#" -gt 0 ]]; do
case $1 in
'--channel'|'-c') CHANNEL="$2"; shift 1;;
'--catalog-image'|'-i') CATALOG_IMAGE="$2"; shift 1;;
'--operator-image'|'-o') OPERATOR_IMAGE="$2"; shift 1;;
'--image-tool'|'-t') IMAGE_TOOL="$2"; shift 1;;
'--force'|'-f') FORCE="true";;
'--help'|'-h') usage; exit;;
esac
shift 1
done
if [[ ! ${CHANNEL} ]] || [[ ! ${CATALOG_IMAGE} ]]; then usage; exit 1; fi
BUNDLE_DIR=$(make bundle-path CHANNEL="${CHANNEL}")
OPM_BUNDLE_MANIFESTS_DIR="${BUNDLE_DIR}/manifests"
CSV="${OPM_BUNDLE_MANIFESTS_DIR}/che-operator.clusterserviceversion.yaml"
CSV_NAME=$(yq -r ".metadata.name" "${CSV}")
CSV_VERSION=$(yq -r ".spec.version" "${CSV}")
IMAGE_REGISTRY_HOST=$(echo "${CATALOG_IMAGE}" | cut -d '/' -f1)
IMAGE_REGISTRY_USER_NAME=$(echo "${CATALOG_IMAGE}" | cut -d '/' -f2)
BUNDLE_IMAGE="${IMAGE_REGISTRY_HOST}/${IMAGE_REGISTRY_USER_NAME}/eclipse-che-openshift-opm-bundles:${CSV_VERSION}"
echo "[INFO] CSV : ${CSV}"
echo "[INFO] CSV name : ${CSV_NAME}"
echo "[INFO] CSV version : ${CSV_VERSION}"
echo "[INFO] Bundle image: ${BUNDLE_IMAGE}"
if [[ -n ${OPERATOR_IMAGE} ]]; then
# set a given operator image into CSV before build
sed -e "s|image:.*|image: ${OPERATOR_IMAGE}|" -i "${CSV}"
fi
}
usage () {
echo "Build and push custom catalog and bundle images."
echo
echo "Usage:"
echo -e "\t$0 -i CATALOG_IMAGE [-c CHANNEL] [-o OPERATOR_IMAGE] [-t IMAGE_TOOL] [--force]"
echo
echo "OPTIONS:"
echo -e "\t-i,--catalog-image Catalog image to build"
echo -e "\t-c,--channel=next|stable [default: next] Olm channel to build bundle from"
echo -e "\t-o,--operator-image Operator image to include into bundle"
echo -e "\t-t,--image-tool [default: docker] Image tool"
echo -e "\t-f,--force Force to rebuild a bundle"
echo
echo "Example:"
echo -e "\t$0 -i quay.io/eclipse/eclipse-che-openshift-opm-catalog:next -c next"
echo -e "\t$0 -i quay.io/eclipse/eclipse-che-openshift-opm-catalog:next -c next -t podman -f"
echo -e "\t$0 -i quay.io/eclipse/eclipse-che-openshift-opm-catalog:test -c stable"
}
buildBundle() {
if [[ $(isBundleImageExists) == 0 ]] || [[ "${FORCE}" == "true" ]]; then
echo "[INFO] Build bundle image"
buildBundleImage
else
echo "[INFO] Bundle image already exists. Use '--force' flag to force build."
fi
}
buildBundleImage() {
make bundle-build bundle-push CHANNEL="${CHANNEL}" BUNDLE_IMG="${BUNDLE_IMAGE}" IMAGE_TOOL="${IMAGE_TOOL}"
}
buildCatalog () {
if [ $(isCatalogExists) == 0 ]; then
echo "[INFO] Build a new catalog"
buildCatalogImage
else
if [[ $(isBundleExistsInCatalog) == 0 ]]; then
echo "[INFO] Add a new bundle ${CSV_NAME} to the catalog"
buildCatalogImageFromIndex
else
echo "[INFO] Bundle ${CSV_NAME} already exists in the catalog"
fi
fi
}
isBundleExistsInCatalog() {
local EXISTED_BUNDLE_NAME=$(${IMAGE_TOOL} run --entrypoint sh "${CATALOG_IMAGE}" -c "apk add sqlite && sqlite3 /database/index.db 'SELECT operatorbundle_name FROM channel_entry WHERE channel_name=\"${CHANNEL}\" and operatorbundle_name=\"${CSV_NAME}\"'" | tail -n1 | tr -d '\r')
# docker run produce more output then a single line
# so, it is needed to check if the last line is actually a given bundle name
if [[ "${EXISTED_BUNDLE_NAME}" == "${CSV_NAME}" ]]; then echo 1; else echo 0; fi
}
isBundleImageExists() {
skopeo inspect docker://"${BUNDLE_IMAGE}" 2>/dev/null | jq -r ".RepoTags[]|select(. == \"${CSV_VERSION}\")" | wc -l
}
isCatalogExists() {
CATALOG_TAG=$(echo "${CATALOG_IMAGE}" | rev | cut -d ':' -f1 | rev)
skopeo inspect docker://"${CATALOG_IMAGE}" 2>/dev/null | jq -r ".RepoTags[]|select(. == \"${CATALOG_TAG}\")" | wc -l
}
buildCatalogImageFromIndex() {
make catalog-build CATALOG_IMG="${CATALOG_IMAGE}" BUNDLE_IMG="${BUNDLE_IMAGE}" IMAGE_TOOL="${IMAGE_TOOL}" FROM_INDEX_OPT="--from-index ${CATALOG_IMAGE}"
make catalog-push CATALOG_IMG="${CATALOG_IMAGE}" IMAGE_TOOL="${IMAGE_TOOL}"
}
buildCatalogImage() {
make catalog-build CATALOG_IMG="${CATALOG_IMAGE}" BUNDLE_IMG="${BUNDLE_IMAGE}" IMAGE_TOOL="${IMAGE_TOOL}"
make catalog-push CATALOG_IMG="${CATALOG_IMAGE}" IMAGE_TOOL="${IMAGE_TOOL}"
}
init "$@"
pushd "${OPERATOR_REPO}" >/dev/null
buildBundle
buildCatalog
popd >/dev/null
echo "[INFO] Done"

91
build/scripts/olm/release-catalog.sh Executable file
View File

@ -0,0 +1,91 @@
#!/bin/bash
#
# Copyright (c) 2019-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
#
set -e
OPERATOR_REPO=$(dirname "$(dirname "$(dirname "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")")")")
init() {
unset CHANNEL
unset CATALOG_IMAGE
unset IMAGE_TOOL
while [[ "$#" -gt 0 ]]; do
case $1 in
'--channel'|'-c') CHANNEL="$2"; shift 1;;
'--catalog-image'|'-i') CATALOG_IMAGE="$2"; shift 1;;
'--image-tool'|'-t') IMAGE_TOOL="$2"; shift 1;;
'--help'|'-h') usage; exit;;
esac
shift 1
done
[[ ! ${IMAGE_TOOL} ]] && IMAGE_TOOL="docker"
if [[ ! ${CHANNEL} ]] || [[ ! ${CATALOG_IMAGE} ]]; then usage; exit 1; fi
BUNDLE_NAME=$(make bundle-name CHANNEL="${CHANNEL}")
BUNDLE_VERSION=$(make bundle-version CHANNEL="${CHANNEL}")
REGISTRY="$(echo "${CATALOG_IMAGE}" | rev | cut -d '/' -f2- | rev)"
BUNDLE_IMAGE="${REGISTRY}/eclipse-che-olm-bundle:${BUNDLE_VERSION}"
echo "[INFO] Bundle name : ${BUNDLE_NAME}"
echo "[INFO] Bundle version: ${BUNDLE_VERSION}"
echo "[INFO] Bundle image : ${BUNDLE_IMAGE}"
echo "[INFO] Catalog image : ${CATALOG_IMAGE}"
}
usage () {
echo "Build and push catalog and bundle images."
echo
echo "Usage:"
echo -e "\t$0 -i CATALOG_IMAGE -c CHANNEL [-o OPERATOR_IMAGE] [-t IMAGE_TOOL]"
echo
echo "Options:"
echo -e "\t-i,--catalog-image Catalog image to build"
echo -e "\t-c,--channel=next|stable Olm channel to build bundle from"
echo -e "\t-t,--image-tool [default: docker] Image tool"
echo
echo "Example:"
echo -e "\t$0 -i quay.io/eclipse/eclipse-che-olm-catalog:next -c next"
echo -e "\t$0 -i quay.io/eclipse/eclipse-che-olm-catalog:stable -c stable"
}
build () {
CHANNEL_PATH=$(make channel-path CHANNEL="${CHANNEL}")
if [[ $(yq -r '.entries[] | select(.name == "'${BUNDLE_NAME}'")' "${CHANNEL_PATH}") ]]; then
echo "[INFO] Bundle ${BUNDLE_NAME} already exists in the catalog"
exit 0
else
echo "[INFO] Build and push the new bundle image"
make bundle-build bundle-push CHANNEL="${CHANNEL}" BUNDLE_IMG="${BUNDLE_IMAGE}" IMAGE_TOOL="${IMAGE_TOOL}"
echo "[INFO] Add bundle to the catalog"
LAST_BUNDLE_NAME=$(yq -r '.entries | .[length - 1].name' "${CHANNEL_PATH}")
make bundle-render CHANNEL="${CHANNEL}" BUNDLE_NAME="${BUNDLE_NAME}" BUNDLE_IMG="${BUNDLE_IMAGE}"
yq -riY '(.entries) += [{"name": "'${BUNDLE_NAME}'", "replaces": "'${LAST_BUNDLE_NAME}'"}]' "${CHANNEL_PATH}"
fi
echo "[INFO] Build and push the catalog image"
make catalog-build catalog-push CHANNEL="${CHANNEL}" CATALOG_IMG="${CATALOG_IMAGE}" IMAGE_TOOL="${IMAGE_TOOL}"
make license $(make catalog-path CHANNEL="${CHANNEL}")
}
init "$@"
pushd "${OPERATOR_REPO}" >/dev/null
build
popd >/dev/null
echo "[INFO] Done"

179
build/scripts/olm/test-catalog-from-sources.sh Executable file
View File

@ -0,0 +1,179 @@
#!/bin/bash
#
# Copyright (c) 2019-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
#
set -e
OPERATOR_REPO=$(dirname "$(dirname "$(dirname "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")")")")
source "${OPERATOR_REPO}/build/scripts/oc-tests/oc-common.sh"
export ECLIPSE_CHE_ROOT_DIR=/tmp/eclipse-che
export CATALOG_DIR=${ECLIPSE_CHE_ROOT_DIR}/olm-catalog/next
export BUNDLE_DIR=${ECLIPSE_CHE_ROOT_DIR}/bundle
export CA_DIR=${ECLIPSE_CHE_ROOT_DIR}/certificates
export BUNDLE_NAME=$(make bundle-name CHANNEL=next)
# Images names in the OpenShift registry
export REGISTRY_BUNDLE_IMAGE_NAME="eclipse-che-bundle"
export REGISTRY_CATALOG_IMAGE_NAME="eclipse-che-catalog"
export REGISTRY_OPERATOR_IMAGE_NAME="eclipse-che-operator"
# Images
unset OPERATOR_IMAGE
unset BUNDLE_IMAGE
unset CATALOG_IMAGE
init() {
unset VERBOSE
while [[ "$#" -gt 0 ]]; do
case $1 in
'--help'|'-h') usage; exit;;
'--verbose'|'-v') VERBOSE=1;;
esac
shift 1
done
rm -rf ${ECLIPSE_CHE_ROOT_DIR}
mkdir -p ${CATALOG_DIR}
mkdir -p ${BUNDLE_DIR}
mkdir -p ${CA_DIR}
}
usage () {
echo "Deploy Eclipse Che from sources"
echo
echo "Usage:"
echo -e "\t$0 [--verbose]"
echo
echo "OPTIONS:"
echo -e "\t-v,--verbose Verbose mode"
echo
echo "Example:"
echo -e "\t$0"
}
exposeOpenShiftRegistry() {
oc patch configs.imageregistry.operator.openshift.io/cluster --patch '{"spec":{"defaultRoute":true}}' --type=merge
sleep 5s
REGISTRY_HOST=$(oc get route default-route -n openshift-image-registry --template='{{ .spec.host }}')
BUNDLE_IMAGE="${REGISTRY_HOST}/${NAMESPACE}/${REGISTRY_BUNDLE_IMAGE_NAME}:latest"
echo "[INFO] Bundle image: ${BUNDLE_IMAGE}"
OPERATOR_IMAGE="${REGISTRY_HOST}/${NAMESPACE}/${REGISTRY_OPERATOR_IMAGE_NAME}:latest"
echo "[INFO] Operator image: ${OPERATOR_IMAGE}"
CATALOG_IMAGE="${REGISTRY_HOST}/${NAMESPACE}/${REGISTRY_CATALOG_IMAGE_NAME}:latest"
echo "[INFO] Catalog image: ${CATALOG_IMAGE}"
oc get secret -n openshift-ingress router-certs-default -o go-template='{{index .data "tls.crt"}}' | base64 -d > ${CA_DIR}/ca.crt
oc delete configmap openshift-registry --ignore-not-found=true -n openshift-config
oc create configmap openshift-registry -n openshift-config --from-file=${REGISTRY_HOST}=${CA_DIR}/ca.crt
oc patch image.config.openshift.io/cluster --patch '{"spec":{"additionalTrustedCA":{"name":"openshift-registry"}}}' --type=merge
oc policy add-role-to-user system:image-builder system:anonymous -n "${NAMESPACE}"
oc policy add-role-to-user system:image-builder system:unauthenticated -n "${NAMESPACE}"
oc policy add-role-to-user system:image-builder system:anonymous -n "openshift-marketplace"
oc policy add-role-to-user system:image-builder system:unauthenticated -n "openshift-marketplace"
}
buildOperatorFromSources() {
oc delete buildconfigs ${REGISTRY_OPERATOR_IMAGE_NAME} --ignore-not-found=true -n "${NAMESPACE}"
oc delete imagestreamtag ${REGISTRY_OPERATOR_IMAGE_NAME}:latest --ignore-not-found=true -n "${NAMESPACE}"
oc new-build --binary --strategy docker --name "${REGISTRY_OPERATOR_IMAGE_NAME}" -n "${NAMESPACE}"
oc start-build "${REGISTRY_OPERATOR_IMAGE_NAME}" --from-dir "${OPERATOR_REPO}" -n "${NAMESPACE}" --wait
}
buildBundleFromSources() {
cp -r $(make bundle-path CHANNEL=next)/* ${BUNDLE_DIR}
mv ${BUNDLE_DIR}/bundle.Dockerfile ${BUNDLE_DIR}/Dockerfile
# Set operator image from the registry
yq -rYi '.spec.install.spec.deployments[0].spec.template.spec.containers[0].image = "'${OPERATOR_IMAGE}'"' ${BUNDLE_DIR}/manifests/che-operator.clusterserviceversion.yaml
oc delete buildconfigs ${REGISTRY_BUNDLE_IMAGE_NAME} --ignore-not-found=true -n "${NAMESPACE}"
oc delete imagestreamtag ${REGISTRY_BUNDLE_IMAGE_NAME}:latest --ignore-not-found=true -n "${NAMESPACE}"
oc new-build --binary --strategy docker --name "${REGISTRY_BUNDLE_IMAGE_NAME}" -n "${NAMESPACE}"
oc start-build "${REGISTRY_BUNDLE_IMAGE_NAME}" --from-dir ${BUNDLE_DIR} -n "${NAMESPACE}" --wait
}
buildCatalogFromSources() {
cat > ${CATALOG_DIR}/package.yaml <<EOF
schema: olm.package
name: eclipse-che
defaultChannel: next
EOF
cat > ${CATALOG_DIR}/channel.yaml <<EOF
schema: olm.channel
package: eclipse-che
name: next
entries:
- name: ${BUNDLE_NAME}
EOF
make bundle-render CHANNEL=next BUNDLE_NAME="${BUNDLE_NAME}" CATALOG_DIR="${CATALOG_DIR}" BUNDLE_IMG="${BUNDLE_IMAGE}" VERBOSE=${VERBOSE}
cp "${OPERATOR_REPO}/olm-catalog/index.Dockerfile" $(dirname "${CATALOG_DIR}")/Dockerfile
sed -i 's|ADD olm-catalog/${CHANNEL}|ADD '$(basename ${CATALOG_DIR})'|g' $(dirname "${CATALOG_DIR}")/Dockerfile
oc delete buildconfigs ${REGISTRY_CATALOG_IMAGE_NAME} --ignore-not-found=true -n "${NAMESPACE}"
oc delete imagestreamtag ${REGISTRY_CATALOG_IMAGE_NAME}:latest --ignore-not-found=true -n "${NAMESPACE}"
oc new-build --binary --strategy docker --name "${REGISTRY_CATALOG_IMAGE_NAME}" -n "${NAMESPACE}"
oc start-build "${REGISTRY_CATALOG_IMAGE_NAME}" --from-dir $(dirname ${CATALOG_DIR}) -n "${NAMESPACE}" --wait
}
createEclipseCheCatalogFromSources() {
buildOperatorFromSources
buildBundleFromSources
buildCatalogFromSources
make create-catalogsource NAME="${ECLIPSE_CHE_CATALOG_SOURCE_NAME}" NAMESPACE="${NAMESPACE}" IMAGE="${CATALOG_IMAGE}" VERBOSE=${VERBOSE}
}
run() {
make create-namespace NAMESPACE="${NAMESPACE}" VERBOSE=${VERBOSE}
exposeOpenShiftRegistry
createEclipseCheCatalogFromSources
if [[ $(oc get operatorgroup -n "${NAMESPACE}" --no-headers | wc -l) == 0 ]]; then
make create-operatorgroup NAME=eclipse-che NAMESPACE="${NAMESPACE}" VERBOSE=${VERBOSE}
fi
make create-subscription \
NAME=eclipse-che-subscription \
NAMESPACE="${NAMESPACE}" \
PACKAGE_NAME="${ECLIPSE_CHE_PACKAGE_NAME}" \
SOURCE="${ECLIPSE_CHE_CATALOG_SOURCE_NAME}" \
SOURCE_NAMESPACE="${NAMESPACE}" \
INSTALL_PLAN_APPROVAL=Auto \
CHANNEL=next \
VERBOSE=${VERBOSE}
make wait-pod-running NAMESPACE="${NAMESPACE}" SELECTOR="app.kubernetes.io/component=che-operator"
if [[ $(oc get checluster -n eclipse-che --no-headers | wc -l) == 0 ]]; then
getCheClusterCRFromInstalledCSV | oc apply -n "${NAMESPACE}" -f -
fi
make wait-eclipseche-version VERSION="$(getCheVersionFromInstalledCSV)" NAMESPACE="${NAMESPACE}" VERBOSE=${VERBOSE}
}
init "$@"
[[ ${VERBOSE} == 1 ]] && set -x
pushd "${OPERATOR_REPO}" >/dev/null
run
popd >/dev/null

26
build/scripts/olm/testCatalog.sh → build/scripts/olm/test-catalog.sh
View File

@ -17,10 +17,10 @@ OPERATOR_REPO=$(dirname "$(dirname "$(dirname "$(dirname "$(readlink -f "${BASH_
source "${OPERATOR_REPO}/build/scripts/oc-tests/oc-common.sh"
init() {
NAMESPACE="eclipse-che"
CHANNEL="next"
unset NAMESPACE
unset VERBOSE
unset CATALOG_IMAGE
unset CHANNEL
while [[ "$#" -gt 0 ]]; do
case $1 in
@ -33,32 +33,32 @@ init() {
shift 1
done
if [[ ! ${CATALOG_IMAGE} ]]; then usage; exit 1; fi
[[ ! ${NAMESPACE} ]] && NAMESPACE="eclipse-che"
if [[ ! ${CHANNEL} ]] || [[ ! ${CATALOG_IMAGE} ]]; then usage; exit 1; fi
}
usage () {
echo "Deploy Eclipse Che from a custom catalog."
echo "Deploy Eclipse Che from a catalog."
echo
echo "Usage:"
echo -e "\t$0 -i CATALOG_IMAGE [-c CHANNEL] [-n NAMESPACE]"
echo -e "\t$0 -i CATALOG_IMAGE -c CHANNEL [-n NAMESPACE] [--verbose]"
echo
echo "OPTIONS:"
echo -e "\t-i,--catalog-image Catalog image"
echo -e "\t-c,--channel=next|stable [default: next] Olm channel to deploy Eclipse Che from"
echo -e "\t-c,--channel=next|stable Olm channel to deploy Eclipse Che from"
echo -e "\t-n,--namespace [default: eclipse-che] Kubernetes namespace to deploy Eclipse Che into"
echo -e "\t-v,--verbose Verbose mode"
echo
echo "Example:"
echo -e "\t$0 -i quay.io/eclipse/eclipse-che-openshift-opm-catalog:next"
echo -e "\t$0 -i quay.io/eclipse/eclipse-che-openshift-opm-catalog:next -c next"
echo -e "\t$0 -i quay.io/eclipse/eclipse-che-openshift-opm-catalog:test -c stable"
echo -e "\t$0 -i quay.io/eclipse/eclipse-che-olm-catalog:next -c next"
echo -e "\t$0 -i quay.io/eclipse/eclipse-che-olm-catalog:test -c stable"
}
run() {
make create-namespace NAMESPACE="eclipse-che" VERBOSE=${VERBOSE}
make create-namespace NAMESPACE="${NAMESPACE}" VERBOSE=${VERBOSE}
make create-catalogsource NAME="${ECLIPSE_CHE_CATALOG_SOURCE_NAME}" IMAGE="${CATALOG_IMAGE}" VERBOSE=${VERBOSE}
discoverEclipseCheBundles ${CHANNEL}
discoverEclipseCheBundles "${CHANNEL}"
if [[ "${LATEST_VERSION}" == "null" ]]; then
echo "[ERROR] CatalogSource does not contain any bundles."
@ -74,7 +74,7 @@ run() {
make create-subscription \
NAME="${ECLIPSE_CHE_SUBSCRIPTION_NAME}" \
NAMESPACE="openshift-operators" \
PACKAGE_NAME="${ECLIPSE_CHE_PREVIEW_PACKAGE_NAME}" \
PACKAGE_NAME="${ECLIPSE_CHE_PACKAGE_NAME}" \
CHANNEL="${CHANNEL}" \
SOURCE="${ECLIPSE_CHE_CATALOG_SOURCE_NAME}" \
SOURCE_NAMESPACE="openshift-marketplace" \
@ -88,7 +88,7 @@ run() {
init "$@"
[[ ${VERBOSE} == 1 ]] && set -x
pushd ${OPERATOR_REPO} >/dev/null
pushd "${OPERATOR_REPO}" >/dev/null
run
popd >/dev/null

27
build/scripts/olm/testUpdate.sh → build/scripts/olm/test-update.sh
View File

@ -17,8 +17,8 @@ OPERATOR_REPO=$(dirname "$(dirname "$(dirname "$(dirname "$(readlink -f "${BASH_
source "${OPERATOR_REPO}/build/scripts/oc-tests/oc-common.sh"
init() {
NAMESPACE="eclipse-che"
CHANNEL="next"
unset CHANNEL
unset NAMESPACE
unset VERBOSE
unset CATALOG_IMAGE
@ -33,6 +33,7 @@ init() {
shift 1
done
[[ ! ${NAMESPACE} ]] && NAMESPACE="eclipse-che"
if [[ ! ${CHANNEL} ]] || [[ ! ${CATALOG_IMAGE} ]]; then usage; exit 1; fi
}
@ -40,24 +41,24 @@ usage () {
echo "Deploy and update Eclipse Che from a custom catalog."
echo
echo "Usage:"
echo -e "\t$0 -i CATALOG_IMAGE [-c CHANNEL] [-n NAMESPACE]"
echo -e "\t$0 -i CATALOG_IMAGE -c CHANNEL [-n NAMESPACE] [--verbose]"
echo
echo "OPTIONS:"
echo -e "\t-i,--catalog-image Catalog image"
echo -e "\t-c,--channel [default: next] Olm channel to deploy Eclipse Che from"
echo -e "\t-n,--namespace [default: eclipse-che] Kubernetes namepsace to deploy Eclipse Che into"
echo -e "\t-c,--channel Olm channel to deploy Eclipse Che from"
echo -e "\t-n,--namespace [default: eclipse-che] Kubernetes namespace to deploy Eclipse Che into"
echo -e "\t-v,--verbose Verbose mode"
echo
echo "Example:"
echo -e "\t$0 -i quay.io/eclipse/eclipse-che-openshift-opm-catalog:next -c next"
echo -e "\t$0 -i quay.io/eclipse/eclipse-che-openshift-opm-catalog:test -c stable"
echo -e "\t$0 -i quay.io/eclipse/eclipse-che-olm-catalog:next -c next"
echo -e "\t$0 -i quay.io/eclipse/eclipse-che-olm-catalog:stable -c stable"
}
run() {
make create-namespace NAMESPACE="eclipse-che" VERBOSE=${VERBOSE}
make create-namespace NAMESPACE="${NAMESPACE}" VERBOSE=${VERBOSE}
make create-catalogsource NAME="${ECLIPSE_CHE_CATALOG_SOURCE_NAME}" IMAGE="${CATALOG_IMAGE}" VERBOSE=${VERBOSE}
discoverEclipseCheBundles ${CHANNEL}
discoverEclipseCheBundles "${CHANNEL}"
if [[ "${PREVIOUS_CSV_NAME}" == "${LATEST_CSV_NAME}" ]]; then
echo "[ERROR] Nothing to update. OLM channel '${CHANNEL}' contains only one bundle '${LATEST_CSV_NAME}'"
@ -84,7 +85,7 @@ run() {
make create-subscription \
NAME="${ECLIPSE_CHE_SUBSCRIPTION_NAME}" \
NAMESPACE="openshift-operators" \
PACKAGE_NAME="${ECLIPSE_CHE_PREVIEW_PACKAGE_NAME}" \
PACKAGE_NAME="${ECLIPSE_CHE_PACKAGE_NAME}" \
CHANNEL="${CHANNEL}" \
SOURCE="${ECLIPSE_CHE_CATALOG_SOURCE_NAME}" \
SOURCE_NAMESPACE="openshift-marketplace" \
@ -95,16 +96,16 @@ run() {
make wait-pod-running NAMESPACE="openshift-operators" SELECTOR="app.kubernetes.io/component=che-operator"
getCheClusterCRFromInstalledCSV | oc apply -n "${NAMESPACE}" -f -
make wait-eclipseche-version VERSION=${PREVIOUS_VERSION} NAMESPACE=${NAMESPACE} VERBOSE=${VERBOSE}
make wait-eclipseche-version VERSION="${PREVIOUS_VERSION}" NAMESPACE=${NAMESPACE} VERBOSE=${VERBOSE}
make approve-installplan SUBSCRIPTION_NAME="${ECLIPSE_CHE_SUBSCRIPTION_NAME}" NAMESPACE="openshift-operators" VERBOSE=${VERBOSE}
make wait-eclipseche-version VERSION=${LATEST_VERSION} NAMESPACE=${NAMESPACE} VERBOSE=${VERBOSE}
make wait-eclipseche-version VERSION="${LATEST_VERSION}" NAMESPACE=${NAMESPACE} VERBOSE=${VERBOSE}
}
init "$@"
[[ ${VERBOSE} == 1 ]] && set -x
pushd ${OPERATOR_REPO} >/dev/null
pushd "${OPERATOR_REPO}" >/dev/null
run
popd >/dev/null

189
build/scripts/olm/testCatalogFromSources.sh
View File

@ -1,189 +0,0 @@
#!/bin/bash
#
# Copyright (c) 2019-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
#
set -e
OPERATOR_REPO=$(dirname "$(dirname "$(dirname "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")")")")
source "${OPERATOR_REPO}/build/scripts/oc-tests/oc-common.sh"
init() {
unset VERBOSE
unset OPERATOR_IMAGE
while [[ "$#" -gt 0 ]]; do
case $1 in
'--help'|'-h') usage; exit;;
'--operator-image'|'-o') OPERATOR_IMAGE="$2"; shift 1;;
'--verbose'|'-v') VERBOSE=1;;
esac
shift 1
done
if [[ ! ${OPERATOR_IMAGE} ]]; then usage; exit 1; fi
}
usage () {
echo "Deploy Eclipse Che from sources"
echo
echo "Usage:"
echo -e "\t$0 -o OPERATOR_IMAGE"
echo
echo "OPTIONS:"
echo -e "\t-o,--operator-image Operator image to include into a bundle"
echo -e "\t-v,--verbose Verbose mode"
echo
echo "Example:"
echo -e "\t$0 -o quay.io/eclipse/che-operator:next"
}
buildNextBundleFromSources() {
local TMP_BUNDLE_DIR=/tmp/bundle
rm -rf ${TMP_BUNDLE_DIR}
mkdir ${TMP_BUNDLE_DIR}
cp -r $(make bundle-path CHANNEL=next)/* ${TMP_BUNDLE_DIR}
mv ${TMP_BUNDLE_DIR}/bundle.Dockerfile ${TMP_BUNDLE_DIR}/Dockerfile
yq -rYi '.spec.install.spec.deployments[0].spec.template.spec.containers[0].image = "'${OPERATOR_IMAGE}'"' ${TMP_BUNDLE_DIR}/manifests/che-operator.clusterserviceversion.yaml
oc new-build --binary --strategy docker --name ${BUNDLE_NAME} -n ${NAMESPACE}
oc start-build ${BUNDLE_NAME} --from-dir ${TMP_BUNDLE_DIR} -n ${NAMESPACE} --wait
}
createImageRegistryViewerUser() {
IMAGE_REGISTRY_VIEWER_USER_NAME=registry-viewer
IMAGE_REGISTRY_VIEWER_USER_PASSWORD=registry-viewer
if ! oc get secret registry-viewer-htpasswd -n openshift-config >/dev/null 2>&1; then
cat > /tmp/htpasswd.conf <<EOF
registry-viewer:{SHA}4xV+Nga1JF5YDx0fB1LdYbyaVvQ=
EOF
oc create secret generic registry-viewer-htpasswd --from-file=htpasswd=/tmp/htpasswd.conf -n openshift-config
oc patch oauths cluster --type merge -p '
spec:
identityProviders:
- name: registry-viewer
mappingMethod: claim
type: HTPasswd
htpasswd:
fileData:
name: registry-viewer-htpasswd
'
fi
IMAGE_REGISTRY_VIEWER_USER_KUBECONFIG=/tmp/${IMAGE_REGISTRY_VIEWER_USER_NAME}.kubeconfig
if [[ -f "${HOME}/.kube/config" ]]; then
cp "${HOME}/.kube/config" ${IMAGE_REGISTRY_VIEWER_USER_KUBECONFIG}
else
cp "${KUBECONFIG}" ${IMAGE_REGISTRY_VIEWER_USER_KUBECONFIG}
fi
timeout 300 bash -c "until oc login --kubeconfig=${IMAGE_REGISTRY_VIEWER_USER_KUBECONFIG} --username=${IMAGE_REGISTRY_VIEWER_USER_NAME} --password=${IMAGE_REGISTRY_VIEWER_USER_PASSWORD} >/dev/null 2>&1; do printf '.'; sleep 1; done"
IMAGE_REGISTRY_VIEWER_USER_TOKEN=$(oc --kubeconfig=${IMAGE_REGISTRY_VIEWER_USER_KUBECONFIG} whoami -t)
oc policy add-role-to-user registry-viewer ${IMAGE_REGISTRY_VIEWER_USER_NAME} -n ${NAMESPACE}
}
createOLMRegistry() {
oc apply -f - <<EOF
apiVersion: v1
kind: Pod
metadata:
name: che-registry
namespace: ${NAMESPACE}
labels:
app: che-registry
annotations:
openshift.io/scc: anyuid
spec:
containers:
- name: registry
image: quay.io/openshift-knative/index
ports:
- containerPort: 50051
name: grpc
protocol: TCP
livenessProbe:
exec:
command:
- grpc_health_probe
- -addr=localhost:50051
readinessProbe:
exec:
command:
- grpc_health_probe
- -addr=localhost:50051
command:
- /bin/sh
- -c
- |-
podman login -u ${IMAGE_REGISTRY_VIEWER_USER_NAME} -p ${IMAGE_REGISTRY_VIEWER_USER_TOKEN} image-registry.openshift-image-registry.svc:5000
/bin/opm registry add --container-tool=podman -d index.db --mode=semver -b image-registry.openshift-image-registry.svc:5000/${NAMESPACE}/${BUNDLE_NAME}
/bin/opm registry serve -d index.db -p 50051
EOF
oc wait --for=condition=ready "pods" -l app=che-registry --timeout=60s -n "${NAMESPACE}"
}
createEclipseCheCatalogSource() {
buildNextBundleFromSources
createImageRegistryViewerUser
createOLMRegistry
local REGISTRY_POD_IP="$(oc get pods -l app=che-registry -n ${NAMESPACE} -o jsonpath='{.items[0].status.podIP}')"
oc apply -f - <<EOF
apiVersion: operators.coreos.com/v1alpha1
kind: CatalogSource
metadata:
name: eclipse-che
namespace: ${NAMESPACE}
spec:
address: "${REGISTRY_POD_IP}:50051"
displayName: "Eclipse Che"
publisher: "Eclipse Che"
sourceType: grpc
EOF
}
run() {
make create-namespace NAMESPACE=${NAMESPACE} VERBOSE=${VERBOSE}
if [[ $(oc get operatorgroup -n ${NAMESPACE} --no-headers | wc -l) == 0 ]]; then
make create-operatorgroup NAME=eclipse-che NAMESPACE=${NAMESPACE} VERBOSE=${VERBOSE}
fi
createEclipseCheCatalogSource
make create-subscription \
NAME=eclipse-che-subscription \
NAMESPACE=${NAMESPACE} \
PACKAGE_NAME=${ECLIPSE_CHE_PREVIEW_PACKAGE_NAME} \
SOURCE=eclipse-che \
SOURCE_NAMESPACE=${NAMESPACE} \
INSTALL_PLAN_APPROVAL=Auto \
CHANNEL=next \
VERBOSE=${VERBOSE}
make wait-pod-running NAMESPACE=${NAMESPACE} SELECTOR="app.kubernetes.io/component=che-operator"
if [[ $(oc get checluster -n eclipse-che --no-headers | wc -l) == 0 ]]; then
getCheClusterCRFromInstalledCSV | oc apply -n "${NAMESPACE}" -f -
fi
make wait-eclipseche-version VERSION="$(getCheVersionFromInstalledCSV)" NAMESPACE=${NAMESPACE} VERBOSE=${VERBOSE}
}
init "$@"
[[ ${VERBOSE} == 1 ]] && set -x
pushd ${OPERATOR_REPO} >/dev/null
run
popd >/dev/null

2
build/scripts/release/RELEASE.md
View File

@ -33,7 +33,7 @@ Start a cluster using `cluster-bot` application.
To be able to test update it is needed to create some user before. Login as `kubeadmin`. Click `Update the cluster OAuth configuration` at the middle of the dashboard, then `Identity providers` -> `Add` -> `HTPassword` and upload a htpassword file (can be created with HTPassword utility). Logout and login using HTPassword, then logout and login as `kubeadmin`. Go to `kube:admin` -> `Copy Login Command` -> `Display Token` and launch showing command in the terminal. Now it is possible to test update:
```bash
build/scripts/olm/testUpdate.sh -c stable -i quay.io/eclipse/eclipse-che-openshift-opm-catalog:test -n eclipse-che
build/scripts/olm/test-update.sh -c stable -i quay.io/eclipse/eclipse-che-olm-catalog:stable
```
## 3. Merge pull requests

2
build/scripts/release/addDigests.sh
View File

@ -30,7 +30,7 @@ command -v yq >/dev/null 2>&1 || { echo "yq is not installed. Aborting."; exit 1
usage () {
echo "Usage: $0 [-w WORKDIR] [-s CSV_FILE_PATH] [-o OPERATOR_DEPLOYMENT_FILE_PATH] [-t IMAGE_TAG] "
echo "Example: build/scripts/release/addDigests.sh -w . -s bundle/stable/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml -o config/manager/manager.yaml -t 7.32.0"
echo "Example: build/scripts/release/addDigests.sh -w . -s bundle/stable/eclipse-che/manifests/che-operator.clusterserviceversion.yaml -o config/manager/manager.yaml -t 7.32.0"
}
if [[ $# -lt 1 ]]; then usage; exit; fi

7
build/scripts/release/make-release.sh
View File

@ -207,7 +207,7 @@ releaseOlmFiles() {
pushd ${OPERATOR_REPO}/build/scripts/release
. release-olm-files.sh --release-version $RELEASE --channel $channel
popd
local openshift=${OPERATOR_REPO}/bundle/$channel/eclipse-che-preview-openshift/manifests
local openshift=${OPERATOR_REPO}/bundle/$channel/eclipse-che/manifests
echo "[INFO] releaseOlmFiles :: Validate changes"
grep -q "version: "$RELEASE $openshift/che-operator.clusterserviceversion.yaml
@ -225,7 +225,10 @@ pushOlmBundlesToQuayIo() {
docker login quay.io -u "${QUAY_ECLIPSE_CHE_USERNAME}" -p "${QUAY_ECLIPSE_CHE_PASSWORD}"
echo "[INFO] Push OLM bundles to quay.io"
. ${OPERATOR_REPO}/build/scripts/olm/buildCatalog.sh -c stable -i quay.io/eclipse/eclipse-che-openshift-opm-catalog:test -f
. "${OPERATOR_REPO}/build/scripts/olm/release-catalog.sh" -c stable -i quay.io/eclipse/eclipse-che-olm-catalog:stable
git add -A olm-catalog/stable
git commit -m "ci: Add new bundle to a catalog" --signoff
}
pushGitChanges() {

9
build/scripts/release/prepare-community-operators-update.sh
View File

@ -55,7 +55,7 @@ Options:
getLatestStableVersions
INDEX_IMAGE="quay.io/eclipse/eclipse-che-openshift-opm-catalog:test"
packageName="eclipse-che-preview-openshift"
packageName="eclipse-che"
echo
echo "## Prepare the OperatorHub package to push to the 'community-operators-prod' repository from local package '${packageName}'"
manifestPackagesDir=$(mktemp -d -t che-openshift-manifest-packages-XXX)
@ -106,16 +106,15 @@ do
sed \
-e "/^ replaces: ${packageName}.v.*/d" \
-e "s/${packageName}/eclipse-che/" \
"${OPERATOR_REPO}/bundle/$channel/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml" \
"${OPERATOR_REPO}/bundle/$channel/${packageName}/manifests/che-operator.clusterserviceversion.yaml" \
> "${folderToUpdate}/${LAST_PACKAGE_VERSION}/manifests/eclipse-che.v${LAST_PACKAGE_VERSION}.clusterserviceversion.yaml"
echo " - Update the CRD files"
cp "${OPERATOR_REPO}/bundle/$channel/eclipse-che-preview-openshift/manifests/org.eclipse.che_checlusters.yaml" "${folderToUpdate}/${LAST_PACKAGE_VERSION}/manifests/org.eclipse.che_checlusters.yaml"
cp "${OPERATOR_REPO}/bundle/$channel/${packageName}/manifests/org.eclipse.che_checlusters.yaml" "${folderToUpdate}/${LAST_PACKAGE_VERSION}/manifests/org.eclipse.che_checlusters.yaml"
echo
cp ${OPERATOR_REPO}/bundle/$channel/eclipse-che-preview-openshift/metadata/* "${folderToUpdate}/${LAST_PACKAGE_VERSION}/metadata"
cp ${OPERATOR_REPO}/bundle/$channel/${packageName}/metadata/* "${folderToUpdate}/${LAST_PACKAGE_VERSION}/metadata"
sed \
-e 's/operators.operatorframework.io.bundle.package.v1: eclipse-che-preview-openshift/operators.operatorframework.io.bundle.package.v1: eclipse-che/' \
-e '/operators.operatorframework.io.test.config.v1/d' \
-e '/operators.operatorframework.io.test.mediatype.v1: scorecard+v1/d' \
-i "${folderToUpdate}/${LAST_PACKAGE_VERSION}/metadata/annotations.yaml"

15
build/scripts/release/release-olm-files.sh
View File

@ -40,10 +40,17 @@ downloadLatestReleasedBundleCRCRD() {
PRE_RELEASE_CSV="${STABLE_BUNDLE_PATH}/generated/openshift/che-operator.clusterserviceversion.yaml"
PRE_RELEASE_CHE_CRD="${STABLE_BUNDLE_PATH}/generated/openshift/org.eclipse.che_checlusters.yaml"
wget "https://raw.githubusercontent.com/eclipse-che/che-operator/${LAST_RELEASE_VERSION}/bundle/stable/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml" \
-q -O "${PRE_RELEASE_CSV}"
wget "https://raw.githubusercontent.com/eclipse-che/che-operator/${LAST_RELEASE_VERSION}/bundle/stable/eclipse-che-preview-openshift/manifests/org.eclipse.che_checlusters.yaml" \
-q -O "${PRE_RELEASE_CHE_CRD}"
# discover remote url depending on package name
if wget -q --spider "https://raw.githubusercontent.com/eclipse-che/che-operator/${LAST_RELEASE_VERSION}/bundle/stable/eclipse-che/manifests/che-operator.clusterserviceversion.yaml"; then
PRE_RELEASE_CSV_URL="https://raw.githubusercontent.com/eclipse-che/che-operator/${LAST_RELEASE_VERSION}/bundle/stable/eclipse-che/manifests/che-operator.clusterserviceversion.yaml"
PRE_RELEASE_CHE_CRD_URL="https://raw.githubusercontent.com/eclipse-che/che-operator/${LAST_RELEASE_VERSION}/bundle/stable/eclipse-che/manifests/org.eclipse.che_checlusters.yaml"
else
PRE_RELEASE_CSV_URL="https://raw.githubusercontent.com/eclipse-che/che-operator/${LAST_RELEASE_VERSION}/bundle/stable/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml"
PRE_RELEASE_CHE_CRD_URL="https://raw.githubusercontent.com/eclipse-che/che-operator/${LAST_RELEASE_VERSION}/bundle/stable/eclipse-che-preview-openshift/manifests/org.eclipse.che_checlusters.yaml"
fi
wget "${PRE_RELEASE_CSV_URL}" -q -O "${PRE_RELEASE_CSV}"
wget "${PRE_RELEASE_CHE_CRD_URL}" -q -O "${PRE_RELEASE_CHE_CRD}"
}
if [[ -z "$RELEASE" ]] || [[ -z "$CHANNEL" ]]; then

2
bundle/next/eclipse-che-preview-openshift/bundle.Dockerfile → bundle/next/eclipse-che/bundle.Dockerfile
View File

@ -4,7 +4,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=eclipse-che-preview-openshift
LABEL operators.operatorframework.io.bundle.package.v1=eclipse-che
LABEL operators.operatorframework.io.bundle.channels.v1=next
LABEL operators.operatorframework.io.bundle.channel.default.v1=next
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.9.0+git

2
bundle/next/eclipse-che-preview-openshift/manifests/che-operator-service_v1_service.yaml → bundle/next/eclipse-che/manifests/che-operator-service_v1_service.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

7
bundle/next/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml → bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/
@ -77,7 +77,7 @@ metadata:
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
repository: https://github.com/eclipse-che/che-operator
support: Eclipse Foundation
name: eclipse-che-preview-openshift.v7.56.0-716.next
name: eclipse-che.v7.57.0-727.next
namespace: placeholder
spec:
apiservicedefinitions: {}
@ -1238,9 +1238,10 @@ spec:
- email: abazko@redhat.com
name: Anatolii Bazko
maturity: stable
minKubeVersion: 1.19.0
provider:
name: Eclipse Foundation
version: 7.56.0-716.next
version: 7.57.0-727.next
webhookdefinitions:
- admissionReviewVersions:
- v1

2
bundle/stable/eclipse-che-preview-openshift/manifests/org.eclipse.che_checlusters.yaml → bundle/next/eclipse-che/manifests/org.eclipse.che_checlusters.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

4
bundle/next/eclipse-che-preview-openshift/metadata/annotations.yaml → bundle/next/eclipse-che/metadata/annotations.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/
@ -15,7 +15,7 @@ annotations:
operators.operatorframework.io.bundle.mediatype.v1: registry+v1
operators.operatorframework.io.bundle.manifests.v1: manifests/
operators.operatorframework.io.bundle.metadata.v1: metadata/
operators.operatorframework.io.bundle.package.v1: eclipse-che-preview-openshift
operators.operatorframework.io.bundle.package.v1: eclipse-che
operators.operatorframework.io.bundle.channels.v1: next
operators.operatorframework.io.bundle.channel.default.v1: next
operators.operatorframework.io.metrics.builder: operator-sdk-v1.9.0+git

0
bundle/next/eclipse-che-preview-openshift/metadata/dependencies.yaml → bundle/next/eclipse-che/metadata/dependencies.yaml
View File

2
bundle/stable/eclipse-che-preview-openshift/tests/scorecard/config.yaml → bundle/next/eclipse-che/tests/scorecard/config.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

296
bundle/stable/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml.diff
View File

@ -1,296 +0,0 @@
--- /home/runner/work/che-operator/che-operator/bundle/stable/eclipse-che-preview-openshift/generated/openshift/che-operator.clusterserviceversion.yaml 2022-11-03 17:44:52.859099538 +0000
+++ /home/runner/work/che-operator/che-operator/bundle/stable/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml 2022-11-03 17:47:00.476599477 +0000
@@ -66,8 +66,8 @@
capabilities: Seamless Upgrades
categories: Developer Tools
certified: "false"
- containerImage: quay.io/eclipse/che-operator@sha256:edac4f591311c817c5f16352cb0db71ef0b33a1a0502dd7d1a4db2de58df79ae
- createdAt: "2022-10-12T19:58:39Z"
+ containerImage: quay.io/eclipse/che-operator@sha256:cff4017f1ef2fa24fa289df2cd5c901404987c0fb5f0782804f96830073d8642
+ createdAt: "2022-11-03T17:44:53Z"
description: A Kube-native development solution that delivers portable and collaborative
developer workspaces.
operatorframework.io/suggested-namespace: openshift-operators
@@ -77,7 +77,7 @@
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
repository: https://github.com/eclipse-che/che-operator
support: Eclipse Foundation
- name: eclipse-che-preview-openshift.v7.55.0
+ name: eclipse-che-preview-openshift.v7.56.0
namespace: placeholder
spec:
apiservicedefinitions: {}
@@ -863,6 +863,16 @@
- subjectaccessreviews
verbs:
- create
+ - apiGroups:
+ - security.openshift.io
+ resources:
+ - securitycontextconstraints
+ verbs:
+ - get
+ - create
+ - delete
+ - update
+ - use
serviceAccountName: che-operator
deployments:
- name: che-operator
@@ -900,15 +910,15 @@
- name: OPERATOR_NAME
value: che-operator
- name: CHE_VERSION
- value: 7.55.0
+ value: 7.56.0
- name: RELATED_IMAGE_che_server
- value: quay.io/eclipse/che-server@sha256:ea85d4b2edcf490319fe7e81ea24afe518a456696594986f7687021595ed0196
+ value: quay.io/eclipse/che-server@sha256:e820f81ffac4d17925e2c82ec389986c0752a95dd9243da1fde1dd6bf11182c9
- name: RELATED_IMAGE_dashboard
- value: quay.io/eclipse/che-dashboard@sha256:437fdcc0c24c1a57f7c7fc835c35cd963857e0cab801d5028314a6e0391e3a36
+ value: quay.io/eclipse/che-dashboard@sha256:d615c3ffa7e012896088655caf6c92d8000effaa588e6cbec385cb1a57ee2c6b
- name: RELATED_IMAGE_plugin_registry
- value: quay.io/eclipse/che-plugin-registry@sha256:bf1fce91744b66247302d57e769390e72b1a7692cd082cf330d08a0cb4507a12
+ value: quay.io/eclipse/che-plugin-registry@sha256:133bb1f1fc16c6866f8d77196d8bd49813fbf69537528f7953843ce07d19bf2f
- name: RELATED_IMAGE_devfile_registry
- value: quay.io/eclipse/che-devfile-registry@sha256:f619562da7caf58d195bae62da9fc871bd5cdbae253419fdecc14348554452ca
+ value: quay.io/eclipse/che-devfile-registry@sha256:5e95433efe606a68e07eb2950abb38f63362333c62efdf2ebbb9f2f2dcbb5443
- name: RELATED_IMAGE_che_tls_secrets_creation_job
value: quay.io/eclipse/che-tls-secret-creator@sha256:54df0ccf598d230e278d512c3b44bdf24edb280f71da32643db46e0120bfaee0
- name: RELATED_IMAGE_postgres
@@ -995,12 +1005,12 @@
value: quay.io/eclipse/che-plugin-sidecar@sha256:2ba8fffe6f2d64f82896367a34fdb657672984548c7904f906178e8e08294277
- name: RELATED_IMAGE_che_plugin_sidecar_plugin_registry_image_IBZWQYJSGU3DUYTCGQYDIZTGMFQTCMRVGY2WEZLCGEZGENDDMQ4DCNRQMNTGCM3GMYZWKZRTMJSTIMRQGQZTAYJWGU3DEZRRMZSTIOBWGM4WGYTGGFTA____
value: quay.io/eclipse/che-plugin-sidecar@sha256:bb404ffaa12565beb12b4cd8160cfa3ff3ef3be420430a6562f1fe48639cbf1f
- - name: RELATED_IMAGE_che_theia_plugin_registry_image_IBZWQYJSGU3DUMTEGQZTMNJUGY2GIMBSHE4GCNZWMIZTSZBYMJSDSNJTGJSDAOLGGNRDCNBYMZSWGYRWGQZTAMZVHFQTQMRQGFQTKODFGQ2TIYZQMNQQ____
- value: quay.io/eclipse/che-theia@sha256:2d4365464d0298a76b39d8bd9532d09f3b148fecb6430359a8201a58e454c0ca
- - name: RELATED_IMAGE_che_machine_exec_plugin_registry_image_IBZWQYJSGU3DUMBTMIZTEM3EGY3DMMDFG43TGZRVMI4DANDFGQYDQMZQGFSTMOJVGIZWCYTBGY4TOY3EMY3DMMTFMYYDOODCMM3GCMZXHBSDQZLEMEYQ____
- value: quay.io/eclipse/che-machine-exec@sha256:03b323d6660e773f5b804e408301e69523aba697cdf662ef078bc6a378d8eda1
- - name: RELATED_IMAGE_che_theia_endpoint_runtime_binary_plugin_registry_image_IBZWQYJSGU3DUNRZGY2WEZDGGJRWINBVMVTDOMDFMU2GIOBSMZTGKMBWHEYTQZRQMJRGENRXGY2GEZRZMQ4TSMZTGQ3WMZRRMEYGGOJZHBRDIYRUGAYA____
- value: quay.io/eclipse/che-theia-endpoint-runtime-binary@sha256:6965bdf2cd45ef70ee4d82ffe06918f0bbb6764bf9d993347ff1a0c998b4b400
+ - name: RELATED_IMAGE_che_theia_plugin_registry_image_IBZWQYJSGU3DUMDGGBSWEMLBMJSDAMRYME3DKYZUGY3DIZBZMQZTEYTBHE3DOOJSG44GGNZXMFSTIMLFGZRDQYRWGRSDMZRUGYYTIM3GGVSGIZBSMUYQ____
+ value: quay.io/eclipse/che-theia@sha256:0f0eb1abd028a65c4664d9d32ba9679278c77ae41e6b8b64d6f46143f5ddd2e1
+ - name: RELATED_IMAGE_che_machine_exec_plugin_registry_image_IBZWQYJSGU3DUN3CGFRWCNDDGEYWEYZSGEZWCNLDG44DEZRWHA3TAZLEG4ZTCNDEG4ZDQMLCGJQWKMZYMQ2DMMDBMJTGEMJQMQ3TEYJUMEYTAOBSHBTA____
+ value: quay.io/eclipse/che-machine-exec@sha256:7b1ca4c11bc213a5c782f6870ed7314d7281b2ae38d460abfb10d72a4a10828f
+ - name: RELATED_IMAGE_che_theia_endpoint_runtime_binary_plugin_registry_image_IBZWQYJSGU3DUODDHEYDGZRZGAYDMNBQGUZTAOJYGBTDGNDCGI2GKNLEGM4WCYTFME4TGYJVMRTGENBVGYZDOM3CGRRDAYZUHBTDOMTFMU3DEOBQMI4Q____
+ value: quay.io/eclipse/che-theia-endpoint-runtime-binary@sha256:8c903f900640530980f34b24e5d39abea93a5dfb456273b4b0c48f72ee6280b9
- name: RELATED_IMAGE_che_editor_jupyter_plugin_registry_image_IBZWQYJSGU3DUOBTGQZTSYLFHFSWIY3BMEZWCOJXGUZTMNZUGIZTCNLBG44TCMTGHEZWKNBZHFTDIOJYGQ3WIYJQHE2GGNBYGAYDGMLFMFSTIYTBGQ3Q____
value: index.docker.io/ksmster/che-editor-jupyter@sha256:83439ae9edcaa3a97536742315a7912f93e499f49847da094c480031eae4ba47
- name: RELATED_IMAGE_dirigible_openshift_plugin_registry_image_IBZWQYJSGU3DUMZTGY2TMMZVMQYWKMBUGAZTMOJXMRSWCMBWG42GEYTCMRRTONBZMM2GEZJSMRRDEOJYGE4GCOJTMI4GKMLFGUZWGM3DGUYTINBRGEZQ____
@@ -1012,17 +1022,17 @@
- name: RELATED_IMAGE_universal_developer_image_plugin_registry_image_IBZWQYJSGU3DUNJTMNSWGNJYMRSDCOJQMRSDCZJQGYYTAMBUG44GCZJYG44WIN3DGI4GCYTEHBTGGOBYGNSDKZTEMY2WEZJTMVRDMZJZGQZWMZJVMU3Q____
value: quay.io/devfile/universal-developer-image@sha256:53cec58dd190dd1e06100478ae879d7c28abd8fc883d5fdf5be3eb6e943fe5e7
- name: RELATED_IMAGE_che_code_plugin_registry_image_NFXHG2LEMVZHG___
- value: quay.io/che-incubator/che-code@sha256:e8d6c4deb36e0051d92620f018225346e4c38ad61439c128b7eb94cf53e2b3a3
- - name: RELATED_IMAGE_che_code_plugin_registry_image_IBZWQYJSGU3DUZJSGVRTOYLDGRSWENBRGA4TGOJXGAYGEODEHEZDMYZXHAZGGYJYMZTDEMZUMIZGEOJQMIYDMNRWGI4TKYTBMFSDINDCMQ3TEOJUGM4Q____
- value: quay.io/che-incubator/che-code@sha256:e25c7ac4eb410939700b8d926c782ca8ff234b2b90b0666295baad44bd729439
+ value: quay.io/che-incubator/che-code@sha256:514b1ab016e4e28b5e995feabf8e687127e55ecb3dbbbd1620c619b8357597e8
+ - name: RELATED_IMAGE_che_code_plugin_registry_image_IBZWQYJSGU3DUZTGG44TCMZUMEZWKNZXMQ4DKZTEGBQTAOJYMU4TCNJVHFRDAZBWGNRDOYTGMU4WEZBSGQ3GGMDBG42DQZRVMNSDOMTCMM2DKZRYHE4Q____
+ value: quay.io/che-incubator/che-code@sha256:ff79134a3e77d85fd0a098e91559b0d63b7bfe9bd246c0a748f5cd72bc45f899
- name: RELATED_IMAGE_universal_developer_image_plugin_registry_image_IBZWQYJSGU3DUNBZHE4DMZTFMQ3WMNDFGI2TKNLBGE2TIYZYGU3DOOJVMM3DQOLCHAZTMNZSGA3GENRTMVRTGNZUGI3GMZJSMM4GKNBTMY2TMMZQMU2A____
value: quay.io/devfile/universal-developer-image@sha256:49986fed7f4e2555a154c856795c689b8367206b63ec37426fe2c8e43f5630e4
- name: RELATED_IMAGE_che_idea_plugin_registry_image_NZSXQ5A_
- value: quay.io/che-incubator/che-idea@sha256:f6a10da8889b342945ff3a18a561b2c276518ddf5a6a90abd8589d251d38125f
+ value: quay.io/che-incubator/che-idea@sha256:7ac67f8fd5351136fd5c3536da84f2899ce239653edac5721de515e0dd435640
- name: RELATED_IMAGE_che_idea_plugin_registry_image_IBZWQYJSGU3DUYRWMM4TGZJYGNRWMMRRGU3TAZLCGYYDIOJQGBSWCOBRG5TDIOBTGZTDIMBVGQZDENZUMJRDMY3BMZRGMNLEMI3GENLBG5TDAYRWHFRA____
value: quay.io/che-incubator/che-idea@sha256:b6c93e83cf21570eb604900ea817f4836f40542274bb6cafbf5db6b5a7f0b69b
- name: RELATED_IMAGE_che_pycharm_plugin_registry_image_NZSXQ5A_
- value: quay.io/che-incubator/che-pycharm@sha256:35c286bf0d98f5cf66f15b73379741f770f7d840229e78a3a8a61fa49af38a83
+ value: quay.io/che-incubator/che-pycharm@sha256:a070b105973a2f0db8a2ca96e699e4e6e4c5bac190d87f23ee1ceb8cce96597f
- name: RELATED_IMAGE_che_pycharm_plugin_registry_image_IBZWQYJSGU3DUYZQMU3GMMLCGAZTAZDDGAYWKZBTMJQWCNJUHAYTIOBSMM3GCYRWGI2DKNTFHE2DGNDDGBTDQYRVGRSWEOLDMQZGEOBYGU2GGNJZG5RA____
value: quay.io/che-incubator/che-pycharm@sha256:c0e6f1b030dc01ed3baa5481482c6ab62456e9434c0f8b54eb9cd2b8854c597b
- name: RELATED_IMAGE_che_buildah_base_plugin_registry_image_IBZWQYJSGU3DUNBRG4ZDAM3EHA3DEOLFMRSDSMTGGE4DOYLGMQZWKYTCGNSDQZDDGI4DGMZYMQZTIOBQHFSWENZVMZTGGMTFGA4GCNBQGBTDQZBVGZRA____
@@ -1032,7 +1042,7 @@
- name: RELATED_IMAGE_che_buildkit_base_plugin_registry_image_IBZWQYJSGU3DUZLGMZQTSODEMQZGGZLEGMYGENJSGBRDENLBMZTGMMLBHA4DAZBRGIYWGZRWMIZWMODBMI2DEYJVGE2DSZLBMRQTINTCME3TSM3DMU4Q____
value: quay.io/eclipse/che-buildkit-base@sha256:effa98dd2ced30b520b25afff1a880d121cf6b3f8ab42a5149eada46ba793ce9
- name: RELATED_IMAGE_che_code_devfile_registry_image_NFXHG2LEMVZHG___
- value: quay.io/che-incubator/che-code@sha256:e8d6c4deb36e0051d92620f018225346e4c38ad61439c128b7eb94cf53e2b3a3
+ value: quay.io/che-incubator/che-code@sha256:514b1ab016e4e28b5e995feabf8e687127e55ecb3dbbbd1620c619b8357597e8
- name: RELATED_IMAGE_universal_developer_image_devfile_registry_image_OVRGSOBNGBSTCOBZMQ4Q____
value: quay.io/devfile/universal-developer-image@sha256:66369ff476b6bd035f5a992d505b0e2a624f46a7d180acb61c41086a37739eea
- name: RELATED_IMAGE_universal_developer_image_devfile_registry_image_OVRGSOBNGMYDKNLFGZSA____
@@ -1047,15 +1057,15 @@
value: quay.io/eclipse/che--centos--mysql-57-centos7@sha256:e08ee4d43b7356607685b69bde6335e27cf20c020f345b6c6c59400183882764
- name: RELATED_IMAGE_che__mariadb_devfile_registry_image_GEYC4NZOGEWTKYJYGAYDSMZWHFSWKNJXMM4DKYRWMY2GCMBYGQYDMMJUG5RGIOLDGUYDKY3EMU3GEOBSGUYGIMJWMEZDOZBSME2WMZLCMZSGKYLEG4______
value: quay.io/eclipse/che--mariadb@sha256:5a8009369ee57c85b6f4a08406147bd9c505cde6b8250d16a27d2a5febfdead7
- - name: RELATED_IMAGE_che_machine_exec_devfile_registry_image_G4XDKNJOGA______
- value: quay.io/eclipse/che-machine-exec@sha256:03b323d6660e773f5b804e408301e69523aba697cdf662ef078bc6a378d8eda1
- - name: RELATED_IMAGE_che_theia_endpoint_runtime_binary_devfile_registry_image_G4XDKNJOGA______
- value: quay.io/eclipse/che-theia-endpoint-runtime-binary@sha256:6965bdf2cd45ef70ee4d82ffe06918f0bbb6764bf9d993347ff1a0c998b4b400
- - name: RELATED_IMAGE_che_theia_devfile_registry_image_G4XDKNJOGA______
- value: quay.io/eclipse/che-theia@sha256:2d4365464d0298a76b39d8bd9532d09f3b148fecb6430359a8201a58e454c0ca
+ - name: RELATED_IMAGE_che_machine_exec_devfile_registry_image_G4XDKNROGA______
+ value: quay.io/eclipse/che-machine-exec@sha256:7b1ca4c11bc213a5c782f6870ed7314d7281b2ae38d460abfb10d72a4a10828f
+ - name: RELATED_IMAGE_che_theia_endpoint_runtime_binary_devfile_registry_image_G4XDKNROGA______
+ value: quay.io/eclipse/che-theia-endpoint-runtime-binary@sha256:8c903f900640530980f34b24e5d39abea93a5dfb456273b4b0c48f72ee6280b9
+ - name: RELATED_IMAGE_che_theia_devfile_registry_image_G4XDKNROGA______
+ value: quay.io/eclipse/che-theia@sha256:0f0eb1abd028a65c4664d9d32ba9679278c77ae41e6b8b64d6f46143f5ddd2e1
- name: RELATED_IMAGE_ubi_minimal_devfile_registry_image_
- value: registry.access.redhat.com/ubi8/ubi-minimal@sha256:e58664de16551db29fb0eaaeb3c4a44eaf95ad89a5b2399a1107041c4f2d6d34
- image: quay.io/eclipse/che-operator@sha256:edac4f591311c817c5f16352cb0db71ef0b33a1a0502dd7d1a4db2de58df79ae
+ value: registry.access.redhat.com/ubi8/ubi-minimal@sha256:33931dce809712888d1a8061bfa676963f517daca993984afed3251bc1fb5987
+ image: quay.io/eclipse/che-operator@sha256:cff4017f1ef2fa24fa289df2cd5c901404987c0fb5f0782804f96830073d8642
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 10
@@ -1342,7 +1352,7 @@
maturity: stable
provider:
name: Eclipse Foundation
- version: 7.55.0
+ version: 7.56.0
webhookdefinitions:
- admissionReviewVersions:
- v1
@@ -1367,6 +1377,27 @@
webhookPath: /validate-org-eclipse-che-v2-checluster
- admissionReviewVersions:
- v1
+ - v1beta1
+ containerPort: 443
+ deploymentName: che-operator
+ failurePolicy: Fail
+ generateName: mchecluster.kb.io
+ rules:
+ - apiGroups:
+ - org.eclipse.che
+ apiVersions:
+ - v2
+ operations:
+ - CREATE
+ - UPDATE
+ resources:
+ - checlusters
+ sideEffects: None
+ targetPort: 9443
+ type: MutatingAdmissionWebhook
+ webhookPath: /mutate-org-eclipse-che-v2-checluster
+ - admissionReviewVersions:
+ - v1
- v2
containerPort: 443
conversionCRDs:
@@ -1378,9 +1409,9 @@
type: ConversionWebhook
webhookPath: /convert
relatedImages:
- - name: che-operator-7.55.0
- image: quay.io/eclipse/che-operator@sha256:edac4f591311c817c5f16352cb0db71ef0b33a1a0502dd7d1a4db2de58df79ae
- # tag: quay.io/eclipse/che-operator:7.55.0
+ - name: che-operator-7.56.0
+ image: quay.io/eclipse/che-operator@sha256:cff4017f1ef2fa24fa289df2cd5c901404987c0fb5f0782804f96830073d8642
+ # tag: quay.io/eclipse/che-operator:7.56.0
- name: kube-rbac-proxy-v0.11.0
image: quay.io/brancz/kube-rbac-proxy@sha256:b62289c3f3f883ee76dd4e8879042dd19abff743340e451cb59f9654fc472e4f
# tag: quay.io/brancz/kube-rbac-proxy:v0.11.0
@@ -1399,18 +1430,18 @@
- name: che--traefik-v2.8.1-4e52a5e2495484f5e19a49edfd2f652b0bce7b3603fa0df545ed90168ffae1c3
image: quay.io/eclipse/che--traefik@sha256:4e52a5e2495484f5e19a49edfd2f652b0bce7b3603fa0df545ed90168ffae1c3
# tag: quay.io/eclipse/che--traefik:v2.8.1-4e52a5e2495484f5e19a49edfd2f652b0bce7b3603fa0df545ed90168ffae1c3
- - name: che-dashboard-7.55.0
- image: quay.io/eclipse/che-dashboard@sha256:437fdcc0c24c1a57f7c7fc835c35cd963857e0cab801d5028314a6e0391e3a36
- # tag: quay.io/eclipse/che-dashboard:7.55.0
- - name: che-devfile-registry-7.55.0
- image: quay.io/eclipse/che-devfile-registry@sha256:f619562da7caf58d195bae62da9fc871bd5cdbae253419fdecc14348554452ca
- # tag: quay.io/eclipse/che-devfile-registry:7.55.0
- - name: che-plugin-registry-7.55.0
- image: quay.io/eclipse/che-plugin-registry@sha256:bf1fce91744b66247302d57e769390e72b1a7692cd082cf330d08a0cb4507a12
- # tag: quay.io/eclipse/che-plugin-registry:7.55.0
- - name: che-server-7.55.0
- image: quay.io/eclipse/che-server@sha256:ea85d4b2edcf490319fe7e81ea24afe518a456696594986f7687021595ed0196
- # tag: quay.io/eclipse/che-server:7.55.0
+ - name: che-dashboard-7.56.0
+ image: quay.io/eclipse/che-dashboard@sha256:d615c3ffa7e012896088655caf6c92d8000effaa588e6cbec385cb1a57ee2c6b
+ # tag: quay.io/eclipse/che-dashboard:7.56.0
+ - name: che-devfile-registry-7.56.0
+ image: quay.io/eclipse/che-devfile-registry@sha256:5e95433efe606a68e07eb2950abb38f63362333c62efdf2ebbb9f2f2dcbb5443
+ # tag: quay.io/eclipse/che-devfile-registry:7.56.0
+ - name: che-plugin-registry-7.56.0
+ image: quay.io/eclipse/che-plugin-registry@sha256:133bb1f1fc16c6866f8d77196d8bd49813fbf69537528f7953843ce07d19bf2f
+ # tag: quay.io/eclipse/che-plugin-registry:7.56.0
+ - name: che-server-7.56.0
+ image: quay.io/eclipse/che-server@sha256:e820f81ffac4d17925e2c82ec389986c0752a95dd9243da1fde1dd6bf11182c9
+ # tag: quay.io/eclipse/che-server:7.56.0
- name: che-tls-secret-creator-alpine-01a4c34
image: quay.io/eclipse/che-tls-secret-creator@sha256:54df0ccf598d230e278d512c3b44bdf24edb280f71da32643db46e0120bfaee0
# tag: quay.io/eclipse/che-tls-secret-creator:alpine-01a4c34
@@ -1501,15 +1532,15 @@
- name: che-plugin-sidecar-@sha256:bb404ffaa12565beb12b4cd8160cfa3ff3ef3be420430a6562f1fe48639cbf1f
image: quay.io/eclipse/che-plugin-sidecar@sha256:bb404ffaa12565beb12b4cd8160cfa3ff3ef3be420430a6562f1fe48639cbf1f
# tag: quay.io/eclipse/che-plugin-sidecar@sha256:bb404ffaa12565beb12b4cd8160cfa3ff3ef3be420430a6562f1fe48639cbf1f
- - name: che-theia-@sha256:2d4365464d0298a76b39d8bd9532d09f3b148fecb6430359a8201a58e454c0ca
- image: quay.io/eclipse/che-theia@sha256:2d4365464d0298a76b39d8bd9532d09f3b148fecb6430359a8201a58e454c0ca
- # tag: quay.io/eclipse/che-theia@sha256:2d4365464d0298a76b39d8bd9532d09f3b148fecb6430359a8201a58e454c0ca
- - name: che-machine-exec-@sha256:03b323d6660e773f5b804e408301e69523aba697cdf662ef078bc6a378d8eda1
- image: quay.io/eclipse/che-machine-exec@sha256:03b323d6660e773f5b804e408301e69523aba697cdf662ef078bc6a378d8eda1
- # tag: quay.io/eclipse/che-machine-exec@sha256:03b323d6660e773f5b804e408301e69523aba697cdf662ef078bc6a378d8eda1
- - name: che-theia-endpoint-runtime-binary-@sha256:6965bdf2cd45ef70ee4d82ffe06918f0bbb6764bf9d993347ff1a0c998b4b400
- image: quay.io/eclipse/che-theia-endpoint-runtime-binary@sha256:6965bdf2cd45ef70ee4d82ffe06918f0bbb6764bf9d993347ff1a0c998b4b400
- # tag: quay.io/eclipse/che-theia-endpoint-runtime-binary@sha256:6965bdf2cd45ef70ee4d82ffe06918f0bbb6764bf9d993347ff1a0c998b4b400
+ - name: che-theia-@sha256:0f0eb1abd028a65c4664d9d32ba9679278c77ae41e6b8b64d6f46143f5ddd2e1
+ image: quay.io/eclipse/che-theia@sha256:0f0eb1abd028a65c4664d9d32ba9679278c77ae41e6b8b64d6f46143f5ddd2e1
+ # tag: quay.io/eclipse/che-theia@sha256:0f0eb1abd028a65c4664d9d32ba9679278c77ae41e6b8b64d6f46143f5ddd2e1
+ - name: che-machine-exec-@sha256:7b1ca4c11bc213a5c782f6870ed7314d7281b2ae38d460abfb10d72a4a10828f
+ image: quay.io/eclipse/che-machine-exec@sha256:7b1ca4c11bc213a5c782f6870ed7314d7281b2ae38d460abfb10d72a4a10828f
+ # tag: quay.io/eclipse/che-machine-exec@sha256:7b1ca4c11bc213a5c782f6870ed7314d7281b2ae38d460abfb10d72a4a10828f
+ - name: che-theia-endpoint-runtime-binary-@sha256:8c903f900640530980f34b24e5d39abea93a5dfb456273b4b0c48f72ee6280b9
+ image: quay.io/eclipse/che-theia-endpoint-runtime-binary@sha256:8c903f900640530980f34b24e5d39abea93a5dfb456273b4b0c48f72ee6280b9
+ # tag: quay.io/eclipse/che-theia-endpoint-runtime-binary@sha256:8c903f900640530980f34b24e5d39abea93a5dfb456273b4b0c48f72ee6280b9
- name: che-editor-jupyter-@sha256:83439ae9edcaa3a97536742315a7912f93e499f49847da094c480031eae4ba47
image: index.docker.io/ksmster/che-editor-jupyter@sha256:83439ae9edcaa3a97536742315a7912f93e499f49847da094c480031eae4ba47
# tag: index.docker.io/ksmster/che-editor-jupyter@sha256:83439ae9edcaa3a97536742315a7912f93e499f49847da094c480031eae4ba47
@@ -1526,22 +1557,22 @@
image: quay.io/devfile/universal-developer-image@sha256:53cec58dd190dd1e06100478ae879d7c28abd8fc883d5fdf5be3eb6e943fe5e7
# tag: quay.io/devfile/universal-developer-image@sha256:53cec58dd190dd1e06100478ae879d7c28abd8fc883d5fdf5be3eb6e943fe5e7
- name: che-code-insiders
- image: quay.io/che-incubator/che-code@sha256:e8d6c4deb36e0051d92620f018225346e4c38ad61439c128b7eb94cf53e2b3a3
+ image: quay.io/che-incubator/che-code@sha256:514b1ab016e4e28b5e995feabf8e687127e55ecb3dbbbd1620c619b8357597e8
# tag: quay.io/che-incubator/che-code:insiders
- - name: che-code-@sha256:e25c7ac4eb410939700b8d926c782ca8ff234b2b90b0666295baad44bd729439
- image: quay.io/che-incubator/che-code@sha256:e25c7ac4eb410939700b8d926c782ca8ff234b2b90b0666295baad44bd729439
- # tag: quay.io/che-incubator/che-code@sha256:e25c7ac4eb410939700b8d926c782ca8ff234b2b90b0666295baad44bd729439
+ - name: che-code-@sha256:ff79134a3e77d85fd0a098e91559b0d63b7bfe9bd246c0a748f5cd72bc45f899
+ image: quay.io/che-incubator/che-code@sha256:ff79134a3e77d85fd0a098e91559b0d63b7bfe9bd246c0a748f5cd72bc45f899
+ # tag: quay.io/che-incubator/che-code@sha256:ff79134a3e77d85fd0a098e91559b0d63b7bfe9bd246c0a748f5cd72bc45f899
- name: universal-developer-image-@sha256:49986fed7f4e2555a154c856795c689b8367206b63ec37426fe2c8e43f5630e4
image: quay.io/devfile/universal-developer-image@sha256:49986fed7f4e2555a154c856795c689b8367206b63ec37426fe2c8e43f5630e4
# tag: quay.io/devfile/universal-developer-image@sha256:49986fed7f4e2555a154c856795c689b8367206b63ec37426fe2c8e43f5630e4
- name: che-idea-next
- image: quay.io/che-incubator/che-idea@sha256:f6a10da8889b342945ff3a18a561b2c276518ddf5a6a90abd8589d251d38125f
+ image: quay.io/che-incubator/che-idea@sha256:7ac67f8fd5351136fd5c3536da84f2899ce239653edac5721de515e0dd435640
# tag: quay.io/che-incubator/che-idea:next
- name: che-idea-@sha256:b6c93e83cf21570eb604900ea817f4836f40542274bb6cafbf5db6b5a7f0b69b
image: quay.io/che-incubator/che-idea@sha256:b6c93e83cf21570eb604900ea817f4836f40542274bb6cafbf5db6b5a7f0b69b
# tag: quay.io/che-incubator/che-idea@sha256:b6c93e83cf21570eb604900ea817f4836f40542274bb6cafbf5db6b5a7f0b69b
- name: che-pycharm-next
- image: quay.io/che-incubator/che-pycharm@sha256:35c286bf0d98f5cf66f15b73379741f770f7d840229e78a3a8a61fa49af38a83
+ image: quay.io/che-incubator/che-pycharm@sha256:a070b105973a2f0db8a2ca96e699e4e6e4c5bac190d87f23ee1ceb8cce96597f
# tag: quay.io/che-incubator/che-pycharm:next
- name: che-pycharm-@sha256:c0e6f1b030dc01ed3baa5481482c6ab62456e9434c0f8b54eb9cd2b8854c597b
image: quay.io/che-incubator/che-pycharm@sha256:c0e6f1b030dc01ed3baa5481482c6ab62456e9434c0f8b54eb9cd2b8854c597b
@@ -1576,15 +1607,15 @@
- name: che--mariadb-10.7.1-5a8009369ee57c85b6f4a08406147bd9c505cde6b8250d16a27d2a5febfdead7
image: quay.io/eclipse/che--mariadb@sha256:5a8009369ee57c85b6f4a08406147bd9c505cde6b8250d16a27d2a5febfdead7
# tag: quay.io/eclipse/che--mariadb:10.7.1-5a8009369ee57c85b6f4a08406147bd9c505cde6b8250d16a27d2a5febfdead7
- - name: che-machine-exec-7.55.0
- image: quay.io/eclipse/che-machine-exec@sha256:03b323d6660e773f5b804e408301e69523aba697cdf662ef078bc6a378d8eda1
- # tag: quay.io/eclipse/che-machine-exec:7.55.0
- - name: che-theia-endpoint-runtime-binary-7.55.0
- image: quay.io/eclipse/che-theia-endpoint-runtime-binary@sha256:6965bdf2cd45ef70ee4d82ffe06918f0bbb6764bf9d993347ff1a0c998b4b400
- # tag: quay.io/eclipse/che-theia-endpoint-runtime-binary:7.55.0
- - name: che-theia-7.55.0
- image: quay.io/eclipse/che-theia@sha256:2d4365464d0298a76b39d8bd9532d09f3b148fecb6430359a8201a58e454c0ca
- # tag: quay.io/eclipse/che-theia:7.55.0
+ - name: che-machine-exec-7.56.0
+ image: quay.io/eclipse/che-machine-exec@sha256:7b1ca4c11bc213a5c782f6870ed7314d7281b2ae38d460abfb10d72a4a10828f
+ # tag: quay.io/eclipse/che-machine-exec:7.56.0
+ - name: che-theia-endpoint-runtime-binary-7.56.0
+ image: quay.io/eclipse/che-theia-endpoint-runtime-binary@sha256:8c903f900640530980f34b24e5d39abea93a5dfb456273b4b0c48f72ee6280b9
+ # tag: quay.io/eclipse/che-theia-endpoint-runtime-binary:7.56.0
+ - name: che-theia-7.56.0
+ image: quay.io/eclipse/che-theia@sha256:0f0eb1abd028a65c4664d9d32ba9679278c77ae41e6b8b64d6f46143f5ddd2e1
+ # tag: quay.io/eclipse/che-theia:7.56.0
- name: ubi-minimal-
- image: registry.access.redhat.com/ubi8/ubi-minimal@sha256:e58664de16551db29fb0eaaeb3c4a44eaf95ad89a5b2399a1107041c4f2d6d34
+ image: registry.access.redhat.com/ubi8/ubi-minimal@sha256:33931dce809712888d1a8061bfa676963f517daca993984afed3251bc1fb5987
# tag: registry.access.redhat.com/ubi8/ubi-minimal

45
bundle/stable/eclipse-che-preview-openshift/manifests/org.eclipse.che_checlusters.yaml.diff
View File

@ -1,45 +0,0 @@
--- /home/runner/work/che-operator/che-operator/bundle/stable/eclipse-che-preview-openshift/generated/openshift/org.eclipse.che_checlusters.yaml 2022-11-03 17:44:53.019101414 +0000
+++ /home/runner/work/che-operator/che-operator/bundle/stable/eclipse-che-preview-openshift/manifests/org.eclipse.che_checlusters.yaml 2022-11-03 17:44:53.031101555 +0000
@@ -3784,7 +3784,7 @@
type: object
type: array
workspaceDefaultEditor:
- default: eclipse/che-theia/latest
+ default: che-incubator/che-code/insiders
description: The default editor to workspace create with. It
could be a plugin ID or a URI. The plugin ID must have `publisher/plugin/version`.
The URI must start from `http`.
@@ -5403,7 +5403,7 @@
- container:
image: quay.io/devfile/universal-developer-image:ubi8-38da5c2
name: universal-developer-image
- defaultEditor: eclipse/che-theia/latest
+ defaultEditor: che-incubator/che-code/insiders
defaultNamespace:
autoProvision: true
template: <username>-che
@@ -5414,6 +5414,15 @@
pvcStrategy: per-user
description: Development environment default configuration options.
properties:
+ containerBuildConfiguration:
+ description: Container build configuration.
+ properties:
+ openShiftSecurityContextConstraint:
+ default: container-build
+ description: OpenShift security context constraint to build
+ containers.
+ type: string
+ type: object
defaultComponents:
default:
- container:
@@ -6920,7 +6929,7 @@
type: object
type: array
defaultEditor:
- default: eclipse/che-theia/latest
+ default: che-incubator/che-code/insiders
description: The default editor to workspace create with. It
could be a plugin ID or a URI. The plugin ID must have `publisher/plugin/version`
format. The URI must start from `http://` or `https://`.

2
bundle/stable/eclipse-che-preview-openshift/bundle.Dockerfile → bundle/stable/eclipse-che/bundle.Dockerfile
View File

@ -4,7 +4,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=eclipse-che-preview-openshift
LABEL operators.operatorframework.io.bundle.package.v1=eclipse-che
LABEL operators.operatorframework.io.bundle.channels.v1=stable
LABEL operators.operatorframework.io.bundle.channel.default.v1=stable
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.9.0+git

2
bundle/stable/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml → bundle/stable/eclipse-che/manifests/che-operator.clusterserviceversion.yaml
View File

@ -77,7 +77,7 @@ metadata:
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
repository: https://github.com/eclipse-che/che-operator
support: Eclipse Foundation
name: eclipse-che-preview-openshift.v7.56.0
name: eclipse-che.v7.56.0
namespace: placeholder
spec:
apiservicedefinitions: {}

0
bundle/next/eclipse-che-preview-openshift/manifests/org.eclipse.che_checlusters.yaml → bundle/stable/eclipse-che/manifests/org.eclipse.che_checlusters.yaml
View File

2
bundle/stable/eclipse-che-preview-openshift/metadata/annotations.yaml → bundle/stable/eclipse-che/metadata/annotations.yaml
View File

@ -15,7 +15,7 @@ annotations:
operators.operatorframework.io.bundle.mediatype.v1: registry+v1
operators.operatorframework.io.bundle.manifests.v1: manifests/
operators.operatorframework.io.bundle.metadata.v1: metadata/
operators.operatorframework.io.bundle.package.v1: eclipse-che-preview-openshift
operators.operatorframework.io.bundle.package.v1: eclipse-che
operators.operatorframework.io.bundle.channels.v1: stable
operators.operatorframework.io.bundle.channel.default.v1: stable
operators.operatorframework.io.metrics.builder: operator-sdk-v1.9.0+git

0
bundle/stable/eclipse-che-preview-openshift/metadata/dependencies.yaml → bundle/stable/eclipse-che/metadata/dependencies.yaml
View File

0
bundle/next/eclipse-che-preview-openshift/tests/scorecard/config.yaml → bundle/stable/eclipse-che/tests/scorecard/config.yaml
View File

2
config/crd/bases/org.eclipse.che_checlusters.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

5
config/manifests/bases/che-operator.clusterserviceversion.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/
@ -27,7 +27,7 @@ metadata:
"fips"]'
repository: https://github.com/eclipse-che/che-operator
support: Eclipse Foundation
name: eclipse-che-preview-openshift.v0.0.0
name: eclipse-che.v0.0.0
namespace: placeholder
spec:
apiservicedefinitions: {}
@ -464,6 +464,7 @@ spec:
- email: abazko@redhat.com
name: Anatolii Bazko
maturity: stable
minKubeVersion: 1.19.0
provider:
name: Eclipse Foundation
version: 0.0.0

2
deploy/deployment/kubernetes/combined.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
deploy/deployment/kubernetes/objects/che-operator-leader-election.Role.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
deploy/deployment/kubernetes/objects/che-operator-leader-election.RoleBinding.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
deploy/deployment/kubernetes/objects/che-operator-selfsigned-issuer.Issuer.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
deploy/deployment/kubernetes/objects/che-operator-service.Service.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
deploy/deployment/kubernetes/objects/che-operator-serving-cert.Certificate.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
deploy/deployment/kubernetes/objects/che-operator.ClusterRole.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
deploy/deployment/kubernetes/objects/che-operator.ClusterRoleBinding.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
deploy/deployment/kubernetes/objects/che-operator.Deployment.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
deploy/deployment/kubernetes/objects/che-operator.Role.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
deploy/deployment/kubernetes/objects/che-operator.RoleBinding.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
deploy/deployment/kubernetes/objects/che-operator.ServiceAccount.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
deploy/deployment/kubernetes/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
deploy/deployment/kubernetes/objects/eclipse-che.Namespace.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
deploy/deployment/kubernetes/objects/org.eclipse.che.MutatingWebhookConfiguration.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
deploy/deployment/kubernetes/objects/org.eclipse.che.ValidatingWebhookConfiguration.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
deploy/deployment/openshift/combined.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
deploy/deployment/openshift/objects/che-operator-leader-election.Role.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
deploy/deployment/openshift/objects/che-operator-leader-election.RoleBinding.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
deploy/deployment/openshift/objects/che-operator-service.Service.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
deploy/deployment/openshift/objects/che-operator.ClusterRole.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
deploy/deployment/openshift/objects/che-operator.ClusterRoleBinding.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
deploy/deployment/openshift/objects/che-operator.Deployment.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
deploy/deployment/openshift/objects/che-operator.Role.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
deploy/deployment/openshift/objects/che-operator.RoleBinding.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
deploy/deployment/openshift/objects/che-operator.ServiceAccount.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
deploy/deployment/openshift/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
deploy/deployment/openshift/objects/eclipse-che.Namespace.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
deploy/deployment/openshift/objects/org.eclipse.che.MutatingWebhookConfiguration.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
deploy/deployment/openshift/objects/org.eclipse.che.ValidatingWebhookConfiguration.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

8
devfile.yaml
View File

@ -58,11 +58,3 @@ commands:
read -p "ENTER the image registry (for example \"quay.io\"): " IMAGE_REGISTRY_HOST &&
read -p "ENTER the image organization (for example \"eclipse\"): " IMAGE_REGISTRY_USER_NAME &&
IMAGE_TOOL=podman make docker-build docker-push IMG="${IMAGE_REGISTRY_HOST}/${IMAGE_REGISTRY_USER_NAME}/che-operator:next"
- id: build-catalog
exec:
label: 6. Build and push Eclipse Che Operator custom catalog and bundle images.
component: tooling-container
commandLine: >
read -p "ENTER the image registry (for example \"quay.io\"): " IMAGE_REGISTRY_HOST &&
read -p "ENTER the image organization (for example \"eclipse\"): " IMAGE_REGISTRY_USER_NAME &&
build/scripts/olm/buildCatalog.sh -c next -i ${IMAGE_REGISTRY_HOST}/${IMAGE_REGISTRY_USER_NAME}/eclipse-che-openshift-opm-catalog:next --image-tool podman

2
hack/boilerplate.go.txt
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2019-2021 Red Hat, Inc.
// Copyright (c) 2019-2022 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/

2
hack/license-header.txt
View File

@ -1,5 +1,5 @@
Copyright (c) 2019-2021 Red Hat, Inc.
Copyright (c) 2019-2022 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/

2
helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
helmcharts/next/templates/che-operator-leader-election.Role.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
helmcharts/next/templates/che-operator-leader-election.RoleBinding.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
helmcharts/next/templates/che-operator-selfsigned-issuer.Issuer.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
helmcharts/next/templates/che-operator-service.Service.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
helmcharts/next/templates/che-operator-serving-cert.Certificate.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
helmcharts/next/templates/che-operator.ClusterRole.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
helmcharts/next/templates/che-operator.ClusterRoleBinding.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
helmcharts/next/templates/che-operator.Deployment.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
helmcharts/next/templates/che-operator.Role.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
helmcharts/next/templates/che-operator.RoleBinding.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
helmcharts/next/templates/che-operator.ServiceAccount.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
helmcharts/next/templates/org.eclipse.che.MutatingWebhookConfiguration.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
helmcharts/next/templates/org.eclipse.che.ValidatingWebhookConfiguration.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

2
helmcharts/next/templates/org_v2_checluster.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/

27
olm-catalog/index.Dockerfile Normal file
View File

@ -0,0 +1,27 @@
# Copyright (c) 2019-2022 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
#
# The base image is expected to contain
# /bin/opm (with a serve subcommand) and /bin/grpc_health_probe
FROM quay.io/operator-framework/opm:latest
ARG CHANNEL
# Configure the entrypoint and command
ENTRYPOINT ["/bin/opm"]
CMD ["serve", "/configs", "--cache-dir=/tmp/cache"]
# Copy declarative config root into image at /configs and pre-populate serve cache
ADD olm-catalog/${CHANNEL} /configs
RUN ["/bin/opm", "serve", "/configs", "--cache-dir=/tmp/cache", "--cache-only", "--termination-log", "/tmp/termination-log"]
# Set DC-specific label for the location of the DC root directory
# in the image
LABEL operators.operatorframework.io.index.configs.v1=/configs

21
olm-catalog/next/channel.yaml Normal file
View File

@ -0,0 +1,21 @@
#
# Copyright (c) 2019-2022 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
#
schema: olm.channel
package: eclipse-che
name: next
entries:
- name: eclipse-che.v7.56.0-724.next
- name: eclipse-che.v7.57.0-725.next
replaces: eclipse-che.v7.56.0-724.next
- name: eclipse-che.v7.57.0-726.next
replaces: eclipse-che.v7.57.0-725.next

50
olm-catalog/next/eclipse-che.v7.56.0-724.next.bundle.yaml Normal file
View File

File diff suppressed because one or more lines are too long

50
olm-catalog/next/eclipse-che.v7.57.0-725.next.bundle.yaml Normal file
View File

File diff suppressed because one or more lines are too long

50
olm-catalog/next/eclipse-che.v7.57.0-726.next.bundle.yaml Normal file
View File

File diff suppressed because one or more lines are too long

8
.ci/openshift-ci/.dockerignore → olm-catalog/next/package.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2021 Red Hat, Inc.
# Copyright (c) 2019-2022 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/
@ -10,6 +10,6 @@
# Red Hat, Inc. - initial API and implementation
#
**/*.diff
**/*.sh
**/*Dockerfile
schema: olm.package
name: eclipse-che
defaultChannel: next

19
olm-catalog/stable/channel.yaml Normal file
View File

@ -0,0 +1,19 @@
#
# Copyright (c) 2019-2022 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
#
schema: olm.channel
package: eclipse-che
name: stable
entries:
- name: eclipse-che.v7.55.0
- name: eclipse-che.v7.56.0
replaces: eclipse-che.v7.55.0

185
olm-catalog/stable/eclipse-che.v7.55.0.bundle.yaml Normal file
View File

File diff suppressed because one or more lines are too long

185
olm-catalog/stable/eclipse-che.v7.56.0.bundle.yaml Normal file
View File

File diff suppressed because one or more lines are too long

Some files were not shown because too many files have changed in this diff Show More