diff --git a/deploy/docker/Readme.md b/deploy/docker/Readme.md new file mode 100644 index 0000000000..96aea9410e --- /dev/null +++ b/deploy/docker/Readme.md @@ -0,0 +1 @@ +Docs are located at [https://www.eclipse.org/che/docs/6/che/docs/docker-single-user.html](https://www.eclipse.org/che/docs/6/che/docs/docker-single-user.html). diff --git a/deploy/kubernetes/Readme.md b/deploy/kubernetes/Readme.md new file mode 100644 index 0000000000..1b065a0eb1 --- /dev/null +++ b/deploy/kubernetes/Readme.md @@ -0,0 +1 @@ +Docs are located at [https://www.eclipse.org/che/docs/6/che/docs/kubernetes-single-user.html](https://www.eclipse.org/che/docs/6/che/docs/kubernetes-single-user.html). diff --git a/dockerfiles/init/modules/che-kubernetes-helm/.helmignore b/deploy/kubernetes/helm/che/.helmignore similarity index 100% rename from dockerfiles/init/modules/che-kubernetes-helm/.helmignore rename to deploy/kubernetes/helm/che/.helmignore diff --git a/dockerfiles/init/modules/che-kubernetes-helm/Chart.yaml b/deploy/kubernetes/helm/che/Chart.yaml similarity index 100% rename from dockerfiles/init/modules/che-kubernetes-helm/Chart.yaml rename to deploy/kubernetes/helm/che/Chart.yaml diff --git a/dockerfiles/init/modules/che-kubernetes-helm/charts/che-keycloak/.helmignore b/deploy/kubernetes/helm/che/charts/che-keycloak/.helmignore similarity index 100% rename from dockerfiles/init/modules/che-kubernetes-helm/charts/che-keycloak/.helmignore rename to deploy/kubernetes/helm/che/charts/che-keycloak/.helmignore diff --git a/dockerfiles/init/modules/che-kubernetes-helm/charts/che-keycloak/Chart.yaml b/deploy/kubernetes/helm/che/charts/che-keycloak/Chart.yaml similarity index 100% rename from dockerfiles/init/modules/che-kubernetes-helm/charts/che-keycloak/Chart.yaml rename to deploy/kubernetes/helm/che/charts/che-keycloak/Chart.yaml diff --git a/dockerfiles/init/modules/che-kubernetes-helm/charts/che-keycloak/templates/deployment.yaml b/deploy/kubernetes/helm/che/charts/che-keycloak/templates/deployment.yaml similarity index 100% rename from dockerfiles/init/modules/che-kubernetes-helm/charts/che-keycloak/templates/deployment.yaml rename to deploy/kubernetes/helm/che/charts/che-keycloak/templates/deployment.yaml diff --git a/dockerfiles/init/modules/che-kubernetes-helm/charts/che-keycloak/templates/ingress.yaml b/deploy/kubernetes/helm/che/charts/che-keycloak/templates/ingress.yaml similarity index 100% rename from dockerfiles/init/modules/che-kubernetes-helm/charts/che-keycloak/templates/ingress.yaml rename to deploy/kubernetes/helm/che/charts/che-keycloak/templates/ingress.yaml diff --git a/dockerfiles/init/modules/che-kubernetes-helm/charts/che-keycloak/templates/keycloak-configure-job.yaml b/deploy/kubernetes/helm/che/charts/che-keycloak/templates/keycloak-configure-job.yaml similarity index 100% rename from dockerfiles/init/modules/che-kubernetes-helm/charts/che-keycloak/templates/keycloak-configure-job.yaml rename to deploy/kubernetes/helm/che/charts/che-keycloak/templates/keycloak-configure-job.yaml diff --git a/dockerfiles/init/modules/che-kubernetes-helm/charts/che-keycloak/templates/keycloak-data-claim.yaml b/deploy/kubernetes/helm/che/charts/che-keycloak/templates/keycloak-data-claim.yaml similarity index 100% rename from dockerfiles/init/modules/che-kubernetes-helm/charts/che-keycloak/templates/keycloak-data-claim.yaml rename to deploy/kubernetes/helm/che/charts/che-keycloak/templates/keycloak-data-claim.yaml diff --git a/dockerfiles/init/modules/che-kubernetes-helm/charts/che-keycloak/templates/keycloak-log-claim.yaml b/deploy/kubernetes/helm/che/charts/che-keycloak/templates/keycloak-log-claim.yaml similarity index 100% rename from dockerfiles/init/modules/che-kubernetes-helm/charts/che-keycloak/templates/keycloak-log-claim.yaml rename to deploy/kubernetes/helm/che/charts/che-keycloak/templates/keycloak-log-claim.yaml diff --git a/dockerfiles/init/modules/che-kubernetes-helm/charts/che-keycloak/templates/service.yaml b/deploy/kubernetes/helm/che/charts/che-keycloak/templates/service.yaml similarity index 100% rename from dockerfiles/init/modules/che-kubernetes-helm/charts/che-keycloak/templates/service.yaml rename to deploy/kubernetes/helm/che/charts/che-keycloak/templates/service.yaml diff --git a/dockerfiles/init/modules/che-kubernetes-helm/charts/che-keycloak/values.yaml b/deploy/kubernetes/helm/che/charts/che-keycloak/values.yaml similarity index 100% rename from dockerfiles/init/modules/che-kubernetes-helm/charts/che-keycloak/values.yaml rename to deploy/kubernetes/helm/che/charts/che-keycloak/values.yaml diff --git a/dockerfiles/init/modules/che-kubernetes-helm/charts/che-postgres/.helmignore b/deploy/kubernetes/helm/che/charts/che-postgres/.helmignore similarity index 100% rename from dockerfiles/init/modules/che-kubernetes-helm/charts/che-postgres/.helmignore rename to deploy/kubernetes/helm/che/charts/che-postgres/.helmignore diff --git a/dockerfiles/init/modules/che-kubernetes-helm/charts/che-postgres/Chart.yaml b/deploy/kubernetes/helm/che/charts/che-postgres/Chart.yaml similarity index 83% rename from dockerfiles/init/modules/che-kubernetes-helm/charts/che-postgres/Chart.yaml rename to deploy/kubernetes/helm/che/charts/che-postgres/Chart.yaml index 57ecf4efeb..304c4603f7 100644 --- a/dockerfiles/init/modules/che-kubernetes-helm/charts/che-postgres/Chart.yaml +++ b/deploy/kubernetes/helm/che/charts/che-postgres/Chart.yaml @@ -6,6 +6,6 @@ # apiVersion: v1 -description: A Helm chart for postgresql, used by Che and Keycloak +description: A Helm chart for postgresql, used by Che name: che-postgres version: 1.0.0 diff --git a/dockerfiles/init/modules/che-kubernetes-helm/charts/che-postgres/templates/deployment.yaml b/deploy/kubernetes/helm/che/charts/che-postgres/templates/deployment.yaml similarity index 100% rename from dockerfiles/init/modules/che-kubernetes-helm/charts/che-postgres/templates/deployment.yaml rename to deploy/kubernetes/helm/che/charts/che-postgres/templates/deployment.yaml diff --git a/dockerfiles/init/modules/che-kubernetes-helm/charts/che-postgres/templates/postgres-data-claim.yaml b/deploy/kubernetes/helm/che/charts/che-postgres/templates/postgres-data-claim.yaml similarity index 100% rename from dockerfiles/init/modules/che-kubernetes-helm/charts/che-postgres/templates/postgres-data-claim.yaml rename to deploy/kubernetes/helm/che/charts/che-postgres/templates/postgres-data-claim.yaml diff --git a/dockerfiles/init/modules/che-kubernetes-helm/charts/che-postgres/templates/service.yaml b/deploy/kubernetes/helm/che/charts/che-postgres/templates/service.yaml similarity index 100% rename from dockerfiles/init/modules/che-kubernetes-helm/charts/che-postgres/templates/service.yaml rename to deploy/kubernetes/helm/che/charts/che-postgres/templates/service.yaml diff --git a/dockerfiles/init/modules/che-kubernetes-helm/charts/che-postgres/values.yaml b/deploy/kubernetes/helm/che/charts/che-postgres/values.yaml similarity index 100% rename from dockerfiles/init/modules/che-kubernetes-helm/charts/che-postgres/values.yaml rename to deploy/kubernetes/helm/che/charts/che-postgres/values.yaml diff --git a/dockerfiles/init/modules/che-kubernetes-helm/readme.md b/deploy/kubernetes/helm/che/readme.md similarity index 94% rename from dockerfiles/init/modules/che-kubernetes-helm/readme.md rename to deploy/kubernetes/helm/che/readme.md index 993ea444bd..ea5a065c71 100644 --- a/dockerfiles/init/modules/che-kubernetes-helm/readme.md +++ b/deploy/kubernetes/helm/che/readme.md @@ -38,22 +38,22 @@ The context of the commands below is the directory in which this readme file res #### Deployment types Currenty, only minikube deployment is supported. -##### Single User +##### Single User Only Che will be deployed. ```bash helm upgrade --install --namespace --set global.cheDomain= ./ ``` - -##### Multi User + +##### Multi User Che, KeyCloak and Postgres will be deployed. ```bash helm upgrade --install --namespace --set global.multiuser=true --set global.cheDomain= ./ ``` - + ##### No Host: - Ingress will serve requests on minikube-ip. + Ingress will serve requests on minikube-ip. Path based routing to Che, Secondary servers (KeyCloak) and Workspace servers. ```bash @@ -62,25 +62,25 @@ Che, KeyCloak and Postgres will be deployed. Workspaces: http:/// Keycloak (if multiuser) : http:///auth/ ``` - -##### Host (partial): + +##### Host (partial): WS Master Ingress will serve requests on provided domain - Workspaces: Ingress will serve requests on minikube-ip, Path Based routing to workspaces. - KeyCloak : dedicated hostname - + Workspaces: Ingress will serve requests on minikube-ip, Path Based routing to workspaces. + KeyCloak : dedicated hostname + ```bash helm upgrade --install --namespace --set global.cheDomain=.xip.io ./ Master: http://master..xip.io Workspaces: http:/// Keycloak (if multiuser): http://keycloak..xip.io/ ``` - + ##### Future options: -- Path Based: single hostname for all components (che, keycloak, WS servers) +- Path Based: single hostname for all components (che, keycloak, WS servers) - Host Based: unique host for each component - TLS - + ## Deleting a Deployment You can delete a deployment using the following command: ``` bash diff --git a/dockerfiles/init/modules/che-kubernetes-helm/requirements.yaml b/deploy/kubernetes/helm/che/requirements.yaml similarity index 100% rename from dockerfiles/init/modules/che-kubernetes-helm/requirements.yaml rename to deploy/kubernetes/helm/che/requirements.yaml diff --git a/dockerfiles/init/modules/che-kubernetes-helm/templates/_hostHelper.tpl b/deploy/kubernetes/helm/che/templates/_hostHelper.tpl similarity index 100% rename from dockerfiles/init/modules/che-kubernetes-helm/templates/_hostHelper.tpl rename to deploy/kubernetes/helm/che/templates/_hostHelper.tpl diff --git a/dockerfiles/init/modules/che-kubernetes-helm/templates/_keycloakAuthUrlHelper.tpl b/deploy/kubernetes/helm/che/templates/_keycloakAuthUrlHelper.tpl similarity index 100% rename from dockerfiles/init/modules/che-kubernetes-helm/templates/_keycloakAuthUrlHelper.tpl rename to deploy/kubernetes/helm/che/templates/_keycloakAuthUrlHelper.tpl diff --git a/dockerfiles/init/modules/che-kubernetes-helm/templates/_keycloakHostHelper.tpl b/deploy/kubernetes/helm/che/templates/_keycloakHostHelper.tpl similarity index 100% rename from dockerfiles/init/modules/che-kubernetes-helm/templates/_keycloakHostHelper.tpl rename to deploy/kubernetes/helm/che/templates/_keycloakHostHelper.tpl diff --git a/dockerfiles/init/modules/che-kubernetes-helm/templates/_secretHelper.tpl b/deploy/kubernetes/helm/che/templates/_secretHelper.tpl similarity index 100% rename from dockerfiles/init/modules/che-kubernetes-helm/templates/_secretHelper.tpl rename to deploy/kubernetes/helm/che/templates/_secretHelper.tpl diff --git a/dockerfiles/init/modules/che-kubernetes-helm/templates/cert-issuer.yaml b/deploy/kubernetes/helm/che/templates/cert-issuer.yaml similarity index 100% rename from dockerfiles/init/modules/che-kubernetes-helm/templates/cert-issuer.yaml rename to deploy/kubernetes/helm/che/templates/cert-issuer.yaml diff --git a/dockerfiles/init/modules/che-kubernetes-helm/templates/certificate.yaml b/deploy/kubernetes/helm/che/templates/certificate.yaml similarity index 100% rename from dockerfiles/init/modules/che-kubernetes-helm/templates/certificate.yaml rename to deploy/kubernetes/helm/che/templates/certificate.yaml diff --git a/dockerfiles/init/modules/che-kubernetes-helm/templates/cluster-role-binding.yaml b/deploy/kubernetes/helm/che/templates/cluster-role-binding.yaml similarity index 100% rename from dockerfiles/init/modules/che-kubernetes-helm/templates/cluster-role-binding.yaml rename to deploy/kubernetes/helm/che/templates/cluster-role-binding.yaml diff --git a/dockerfiles/init/modules/che-kubernetes-helm/templates/configmap.yaml b/deploy/kubernetes/helm/che/templates/configmap.yaml similarity index 100% rename from dockerfiles/init/modules/che-kubernetes-helm/templates/configmap.yaml rename to deploy/kubernetes/helm/che/templates/configmap.yaml diff --git a/dockerfiles/init/modules/che-kubernetes-helm/templates/deployment.yaml b/deploy/kubernetes/helm/che/templates/deployment.yaml similarity index 100% rename from dockerfiles/init/modules/che-kubernetes-helm/templates/deployment.yaml rename to deploy/kubernetes/helm/che/templates/deployment.yaml diff --git a/dockerfiles/init/modules/che-kubernetes-helm/templates/ingress.yaml b/deploy/kubernetes/helm/che/templates/ingress.yaml similarity index 100% rename from dockerfiles/init/modules/che-kubernetes-helm/templates/ingress.yaml rename to deploy/kubernetes/helm/che/templates/ingress.yaml diff --git a/dockerfiles/init/modules/che-kubernetes-helm/templates/pvc.yaml b/deploy/kubernetes/helm/che/templates/pvc.yaml similarity index 100% rename from dockerfiles/init/modules/che-kubernetes-helm/templates/pvc.yaml rename to deploy/kubernetes/helm/che/templates/pvc.yaml diff --git a/dockerfiles/init/modules/che-kubernetes-helm/templates/registry-pull-secret.yaml b/deploy/kubernetes/helm/che/templates/registry-pull-secret.yaml similarity index 100% rename from dockerfiles/init/modules/che-kubernetes-helm/templates/registry-pull-secret.yaml rename to deploy/kubernetes/helm/che/templates/registry-pull-secret.yaml diff --git a/dockerfiles/init/modules/che-kubernetes-helm/templates/service.yaml b/deploy/kubernetes/helm/che/templates/service.yaml similarity index 100% rename from dockerfiles/init/modules/che-kubernetes-helm/templates/service.yaml rename to deploy/kubernetes/helm/che/templates/service.yaml diff --git a/dockerfiles/init/modules/che-kubernetes-helm/templates/serviceaccount.yaml b/deploy/kubernetes/helm/che/templates/serviceaccount.yaml similarity index 100% rename from dockerfiles/init/modules/che-kubernetes-helm/templates/serviceaccount.yaml rename to deploy/kubernetes/helm/che/templates/serviceaccount.yaml diff --git a/dockerfiles/init/modules/che-kubernetes-helm/templates/staging-cert-issuer.yaml b/deploy/kubernetes/helm/che/templates/staging-cert-issuer.yaml similarity index 100% rename from dockerfiles/init/modules/che-kubernetes-helm/templates/staging-cert-issuer.yaml rename to deploy/kubernetes/helm/che/templates/staging-cert-issuer.yaml diff --git a/dockerfiles/init/modules/che-kubernetes-helm/tiller-rbac.yaml b/deploy/kubernetes/helm/che/tiller-rbac.yaml similarity index 100% rename from dockerfiles/init/modules/che-kubernetes-helm/tiller-rbac.yaml rename to deploy/kubernetes/helm/che/tiller-rbac.yaml diff --git a/dockerfiles/init/modules/che-kubernetes-helm/values.yaml b/deploy/kubernetes/helm/che/values.yaml similarity index 100% rename from dockerfiles/init/modules/che-kubernetes-helm/values.yaml rename to deploy/kubernetes/helm/che/values.yaml diff --git a/dockerfiles/init/modules/kubernetes/Deploy Che.md b/deploy/kubernetes/kubectl/Deploy Che.md similarity index 98% rename from dockerfiles/init/modules/kubernetes/Deploy Che.md rename to deploy/kubernetes/kubectl/Deploy Che.md index 6bd72822f4..09aea24543 100644 --- a/dockerfiles/init/modules/kubernetes/Deploy Che.md +++ b/deploy/kubernetes/kubectl/Deploy Che.md @@ -1,6 +1,6 @@ # Deploy single user Che to k8s Tested on minikube with vm providers Virtualbox and kvm2. Note that Che with workspaces requires quite a lot -of RAM. Initial tests were done with 10GB, but it is definitely more than it is needed to start Che +of RAM. Initial tests were done with 10GB, but it is definitely more than it is needed to start Che and couple of workspaces. IP of VM is supposed to be `192.168.99.100`. `nip.io` is also used for handling hosts resolution. diff --git a/dockerfiles/init/modules/kubernetes/files/che-kubernetes.yaml b/deploy/kubernetes/kubectl/che-kubernetes.yaml similarity index 100% rename from dockerfiles/init/modules/kubernetes/files/che-kubernetes.yaml rename to deploy/kubernetes/kubectl/che-kubernetes.yaml diff --git a/deploy/openshift/Readme.md b/deploy/openshift/Readme.md new file mode 100644 index 0000000000..bdcb909b16 --- /dev/null +++ b/deploy/openshift/Readme.md @@ -0,0 +1 @@ +Docs are located at [https://www.eclipse.org/che/docs/6/che/docs/openshift-single-user.html](https://www.eclipse.org/che/docs/6/che/docs/openshift-single-user.html). diff --git a/dockerfiles/init/modules/openshift/files/scripts/che-config b/deploy/openshift/che-config similarity index 100% rename from dockerfiles/init/modules/openshift/files/scripts/che-config rename to deploy/openshift/che-config diff --git a/dockerfiles/init/modules/openshift/files/scripts/che-openshift.yml b/deploy/openshift/che-openshift.yml similarity index 100% rename from dockerfiles/init/modules/openshift/files/scripts/che-openshift.yml rename to deploy/openshift/che-openshift.yml diff --git a/dockerfiles/init/modules/openshift/files/scripts/deploy_che.sh b/deploy/openshift/deploy_che.sh similarity index 99% rename from dockerfiles/init/modules/openshift/files/scripts/deploy_che.sh rename to deploy/openshift/deploy_che.sh index df56e9478b..5da355e7ca 100755 --- a/dockerfiles/init/modules/openshift/files/scripts/deploy_che.sh +++ b/deploy/openshift/deploy_che.sh @@ -8,7 +8,7 @@ # This script is meant for quick & easy install of Che on OpenShift via: # # ``` bash -# DEPLOY_SCRIPT_URL=https://raw.githubusercontent.com/eclipse/che/master/dockerfiles/cli/scripts/openshift/deploy_che.sh +# DEPLOY_SCRIPT_URL=https://raw.githubusercontent.com/eclipse/che/master/deploy/openshift/deploy_che.sh # curl -fsSL ${DEPLOY_SCRIPT_URL} -o get-che.sh # bash get-che.sh --wait-che # ``` diff --git a/dockerfiles/init/modules/openshift/files/scripts/multi-user/configure_keycloak.sh b/deploy/openshift/multi-user/configure_keycloak.sh similarity index 100% rename from dockerfiles/init/modules/openshift/files/scripts/multi-user/configure_keycloak.sh rename to deploy/openshift/multi-user/configure_keycloak.sh diff --git a/dockerfiles/init/modules/openshift/files/scripts/multi-user/deploy_postgres_and_keycloak.sh b/deploy/openshift/multi-user/deploy_postgres_and_keycloak.sh similarity index 100% rename from dockerfiles/init/modules/openshift/files/scripts/multi-user/deploy_postgres_and_keycloak.sh rename to deploy/openshift/multi-user/deploy_postgres_and_keycloak.sh diff --git a/dockerfiles/init/modules/openshift/files/scripts/multi-user/deploy_postgres_only.sh b/deploy/openshift/multi-user/deploy_postgres_only.sh similarity index 100% rename from dockerfiles/init/modules/openshift/files/scripts/multi-user/deploy_postgres_only.sh rename to deploy/openshift/multi-user/deploy_postgres_only.sh diff --git a/dockerfiles/init/modules/openshift/files/scripts/multi-user/keycloak-config/keycloak-config-pod-deployment.yaml b/deploy/openshift/multi-user/keycloak-config/keycloak-config-pod-deployment.yaml similarity index 100% rename from dockerfiles/init/modules/openshift/files/scripts/multi-user/keycloak-config/keycloak-config-pod-deployment.yaml rename to deploy/openshift/multi-user/keycloak-config/keycloak-config-pod-deployment.yaml diff --git a/dockerfiles/init/modules/openshift/files/scripts/multi-user/keycloak/deployment-config.yaml b/deploy/openshift/multi-user/keycloak/deployment-config.yaml similarity index 100% rename from dockerfiles/init/modules/openshift/files/scripts/multi-user/keycloak/deployment-config.yaml rename to deploy/openshift/multi-user/keycloak/deployment-config.yaml diff --git a/dockerfiles/init/modules/openshift/files/scripts/multi-user/keycloak/keycloak-data-claim.yaml b/deploy/openshift/multi-user/keycloak/keycloak-data-claim.yaml similarity index 100% rename from dockerfiles/init/modules/openshift/files/scripts/multi-user/keycloak/keycloak-data-claim.yaml rename to deploy/openshift/multi-user/keycloak/keycloak-data-claim.yaml diff --git a/dockerfiles/init/modules/openshift/files/scripts/multi-user/keycloak/keycloak-log-claim.yaml b/deploy/openshift/multi-user/keycloak/keycloak-log-claim.yaml similarity index 100% rename from dockerfiles/init/modules/openshift/files/scripts/multi-user/keycloak/keycloak-log-claim.yaml rename to deploy/openshift/multi-user/keycloak/keycloak-log-claim.yaml diff --git a/dockerfiles/init/modules/openshift/files/scripts/multi-user/keycloak/route.yaml b/deploy/openshift/multi-user/keycloak/route.yaml similarity index 100% rename from dockerfiles/init/modules/openshift/files/scripts/multi-user/keycloak/route.yaml rename to deploy/openshift/multi-user/keycloak/route.yaml diff --git a/dockerfiles/init/modules/openshift/files/scripts/multi-user/keycloak/service.yaml b/deploy/openshift/multi-user/keycloak/service.yaml similarity index 100% rename from dockerfiles/init/modules/openshift/files/scripts/multi-user/keycloak/service.yaml rename to deploy/openshift/multi-user/keycloak/service.yaml diff --git a/dockerfiles/init/modules/openshift/files/scripts/multi-user/postgres/deployment-config.yaml b/deploy/openshift/multi-user/postgres/deployment-config.yaml similarity index 100% rename from dockerfiles/init/modules/openshift/files/scripts/multi-user/postgres/deployment-config.yaml rename to deploy/openshift/multi-user/postgres/deployment-config.yaml diff --git a/dockerfiles/init/modules/openshift/files/scripts/multi-user/postgres/postgres-data-claim.yaml b/deploy/openshift/multi-user/postgres/postgres-data-claim.yaml similarity index 100% rename from dockerfiles/init/modules/openshift/files/scripts/multi-user/postgres/postgres-data-claim.yaml rename to deploy/openshift/multi-user/postgres/postgres-data-claim.yaml diff --git a/dockerfiles/init/modules/openshift/files/scripts/multi-user/postgres/service.yaml b/deploy/openshift/multi-user/postgres/service.yaml similarity index 100% rename from dockerfiles/init/modules/openshift/files/scripts/multi-user/postgres/service.yaml rename to deploy/openshift/multi-user/postgres/service.yaml diff --git a/dockerfiles/init/modules/openshift/files/scripts/multi-user/wait_until_keycloak_is_available.sh b/deploy/openshift/multi-user/wait_until_keycloak_is_available.sh similarity index 100% rename from dockerfiles/init/modules/openshift/files/scripts/multi-user/wait_until_keycloak_is_available.sh rename to deploy/openshift/multi-user/wait_until_keycloak_is_available.sh diff --git a/dockerfiles/init/modules/openshift/files/scripts/multi-user/wait_until_postgres_is_available.sh b/deploy/openshift/multi-user/wait_until_postgres_is_available.sh similarity index 100% rename from dockerfiles/init/modules/openshift/files/scripts/multi-user/wait_until_postgres_is_available.sh rename to deploy/openshift/multi-user/wait_until_postgres_is_available.sh diff --git a/dockerfiles/init/modules/openshift/files/scripts/ocp.sh b/deploy/openshift/ocp.sh similarity index 87% rename from dockerfiles/init/modules/openshift/files/scripts/ocp.sh rename to deploy/openshift/ocp.sh index fd821d4244..0494377dfd 100755 --- a/dockerfiles/init/modules/openshift/files/scripts/ocp.sh +++ b/deploy/openshift/ocp.sh @@ -34,11 +34,6 @@ export JQ_BINARY_DOWNLOAD_URL=${JQ_BINARY_DOWNLOAD_URL:-${DEFAULT_JQ_BINARY_DOWN DEFAULT_CHE_MULTIUSER="false" export CHE_MULTIUSER=${CHE_MULTIUSER:-${DEFAULT_CHE_MULTIUSER}} -#Using local scripts is error prone and should only be used temporarly while developing Che. -#If unsure leave the default value true set. -DEFAULT_CHE_OPENSHIFT_GENERATE_SCRIPTS=true -export CHE_OPENSHIFT_GENERATE_SCRIPTS=${CHE_OPENSHIFT_GENERATE_SCRIPTS:-${DEFAULT_CHE_OPENSHIFT_GENERATE_SCRIPTS}} - DEFAULT_OPENSHIFT_USERNAME="developer" export OPENSHIFT_USERNAME=${OPENSHIFT_USERNAME:-${DEFAULT_OPENSHIFT_USERNAME}} @@ -75,9 +70,6 @@ export IMAGE_PULL_POLICY=${IMAGE_PULL_POLICY:-${DEFAULT_IMAGE_PULL_POLICY}} DEFAULT_CHE_IMAGE_REPO="eclipse/che-server" export CHE_IMAGE_REPO=${CHE_IMAGE_REPO:-${DEFAULT_CHE_IMAGE_REPO}} -DEFAULT_IMAGE_INIT="eclipse/che-init:nightly" -export IMAGE_INIT=${IMAGE_INIT:-${DEFAULT_IMAGE_INIT}} - DEFAULT_CHE_CLI_IMAGE="eclipse/che-cli:nightly" export CHE_CLI_IMAGE=${CHE_CLI_IMAGE:-${DEFAULT_CHE_CLI_IMAGE}} @@ -178,21 +170,6 @@ run_ocp() { } deploy_che_to_ocp() { - OPENSHIFT_SCRIPTS_FOLDER="${CONFIG_DIR}/instance/config/openshift/scripts/" - #Repull init image only if IMAGE_PULL_POLICY is set to Always - if [ $IMAGE_PULL_POLICY == "Always" ]; then - docker pull "$IMAGE_INIT" - fi - #Only generate scripts and config files if CHE_OPENSHIFT_GENERATE_SCRIPTS=true - if [ $CHE_OPENSHIFT_GENERATE_SCRIPTS == true ]; then - echo "OCP generating temporary scripts and configuration files at ${OPENSHIFT_SCRIPTS_FOLDER} ." - #wipeout config folder - docker run -v "${CONFIG_DIR}":/to_remove alpine sh -c "rm -rf /to_remove/" || true - docker run -t --rm -v /var/run/docker.sock:/var/run/docker.sock -v "${CONFIG_DIR}":/data -e IMAGE_INIT="$IMAGE_INIT" -e CHE_MULTIUSER="$CHE_MULTIUSER" ${CHE_CLI_IMAGE} config --skip:pull --skip:nightly - cd ${OPENSHIFT_SCRIPTS_FOLDER} - else - echo "OCP using existing scripts and configuration files in current folder." - fi if [[ ! -f "deploy_che.sh" ]]; then CURRENT_PWD=$(pwd) echo "OCP script deploy_che.sh does not exist in ${CURRENT_PWD} ." @@ -257,8 +234,7 @@ parse_args() { ENV vars CHE_IMAGE_TAG - set che-server image tag, default: nightly CHE_CLI_IMAGE - set che-cli image, default: eclipse/che-cli:nightly - IMAGE_INIT - set che-cli image, default: eclipse/che-init:nightly - CHE_MULTIUSER - set CHE multi user mode, default: false (single user) + CHE_MULTIUSER - set CHE multi user mode, default: false (single user) OC_PUBLIC_HOSTNAME - set ocp hostname to admin console, default: host ip OC_PUBLIC_IP - set ocp hostname for routing suffix, default: host ip DNS_PROVIDER - set ocp DNS provider for routing suffix, default: nip.io diff --git a/dockerfiles/init/Dockerfile b/dockerfiles/init/Dockerfile index 1a16e79d76..f6b083c94a 100644 --- a/dockerfiles/init/Dockerfile +++ b/dockerfiles/init/Dockerfile @@ -32,7 +32,6 @@ RUN apk --update add openssh \ COPY manifests /etc/puppet/manifests COPY modules /etc/puppet/modules -COPY docs /files/docs COPY entrypoint.sh / RUN chmod +x entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/dockerfiles/init/docs/DOCS.md b/dockerfiles/init/docs/DOCS.md deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/dockerfiles/init/docs/README.md b/dockerfiles/init/docs/README.md deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/dockerfiles/init/modules/base/manifests/init.pp b/dockerfiles/init/modules/base/manifests/init.pp index 4b38328576..fcc33f9a03 100644 --- a/dockerfiles/init/modules/base/manifests/init.pp +++ b/dockerfiles/init/modules/base/manifests/init.pp @@ -27,5 +27,4 @@ class base { include traefik include postgres include keycloak - include openshift } diff --git a/dockerfiles/init/modules/openshift/manifests/init.pp b/dockerfiles/init/modules/openshift/manifests/init.pp deleted file mode 100644 index fd6a4df7ea..0000000000 --- a/dockerfiles/init/modules/openshift/manifests/init.pp +++ /dev/null @@ -1,13 +0,0 @@ -class openshift { - file { "/opt/che/config/openshift": - ensure => "directory", - mode => "755", - } -> - file { 'Openshift scritps and descriptors': - path => '/opt/che/config/openshift/scripts', - ensure => "present", - source => 'puppet:///modules/openshift/scripts', - mode => "755", - recurse => true, - } -}