Skip to content

Commit

Permalink
Fixes
Browse files Browse the repository at this point in the history
Signed-off-by: Anatolii Bazko <[email protected]>
  • Loading branch information
tolusha committed Jun 15, 2021
1 parent 671bea2 commit d10d6cf
Show file tree
Hide file tree
Showing 15 changed files with 50 additions and 7,830 deletions.
18 changes: 0 additions & 18 deletions .github/bin/check-resources.sh
Original file line number Diff line number Diff line change
Expand Up @@ -143,23 +143,6 @@ checkRoles() {
fi
}

checkDW() {
# files to check
local CHEMANAGER_CRD="deploy/crds/chemanagers.che.eclipse.org.CustomResourceDefinition.yaml"
local DWROUTINGS_CRD="deploy/crds/devworkspaceroutings.controller.devfile.io.CustomResourceDefinition.yaml"

changedFiles=(
$(git diff --name-only)
)
if [[ " ${changedFiles[*]} " =~ $CHEMANAGER_CRD ]] || [[ " ${changedFiles[*]} " =~ $DWROUTINGS_CRD ]]; then
echo "[ERROR] DWCO resources are not up to date: ${BASH_REMATCH}"
echo "[ERROR] Run 'olm/update-resources.sh' to download them."
exit 1
else
echo "[INFO] DWCO resources are up to date."
fi
}

installOperatorSDK

pushd "${ROOT_PROJECT_DIR}" || true
Expand All @@ -170,7 +153,6 @@ checkRoles
checkNightlyOlmBundle
checkDockerfile
checkOperatorYaml
checkDW

popd || true

Expand Down
4 changes: 1 addition & 3 deletions deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ CHE_OPERATOR_IMAGE="quay.io/eclipse/che-operator:nightly"
while [[ "$#" -gt 0 ]]; do
case $1 in
'--namespace'|'-n') NAMESPACE=$2; shift 1;;
'--che-operator-image') CHE_OPERATOR_IMAGE=$2; shift 1;;
'--che-operator-image'|'-i') CHE_OPERATOR_IMAGE=$2; shift 1;;
esac
shift 1
done
Expand All @@ -33,8 +33,6 @@ oc apply -f ${BASE_DIR}/deploy/cluster_role_binding.yaml -n $NAMESPACE
oc apply -f ${BASE_DIR}/deploy/proxy_cluster_role.yaml -n $NAMESPACE
oc apply -f ${BASE_DIR}/deploy/proxy_cluster_role_binding.yaml -n $NAMESPACE
oc apply -f ${BASE_DIR}/deploy/crds/org_v1_che_crd.yaml -n $NAMESPACE
oc apply -f ${BASE_DIR}/deploy/crds/chemanagers.che.eclipse.org.CustomResourceDefinition.yaml -n $NAMESPACE
oc apply -f ${BASE_DIR}/deploy/crds/devworkspaceroutings.controller.devfile.io.CustomResourceDefinition.yaml -n $NAMESPACE
sleep 5

cp -f ${BASE_DIR}/deploy/operator.yaml /tmp/operator.yaml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,13 @@ metadata:
categories: Developer Tools
certified: "false"
containerImage: quay.io/eclipse/che-operator:nightly
createdAt: "2021-06-14T10:04:34Z"
createdAt: "2021-06-15T09:24:31Z"
description: A Kube-native development solution that delivers portable and collaborative
developer workspaces.
operatorframework.io/suggested-namespace: eclipse-che
repository: https://github.com/eclipse-che/che-operator
support: Eclipse Foundation
name: eclipse-che-preview-kubernetes.v7.32.0-208.nightly
name: eclipse-che-preview-kubernetes.v7.32.0-214.nightly
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -1240,4 +1240,4 @@ spec:
maturity: stable
provider:
name: Eclipse Foundation
version: 7.32.0-208.nightly
version: 7.32.0-214.nightly

This file was deleted.

Loading

0 comments on commit d10d6cf

Please sign in to comment.