diff --git a/deploy/kubernetes/kubectl/Deploy Che.md b/deploy/kubernetes/kubectl/Deploy Che.md index cf2172fde4..09aea24543 100644 --- a/deploy/kubernetes/kubectl/Deploy Che.md +++ b/deploy/kubernetes/kubectl/Deploy Che.md @@ -33,7 +33,3 @@ and clean redeploy of Che. - Create namespace `che`: `kubectl create namespace che` - Deploy Che: `kubectl --namespace=che apply -f che-kubernetes.yaml` - Check Che pod status until it become `Running`: `kubectl get --namespace=che pods` - -### Workspace Next: -There is a file `wsnext/feature-api.yaml` which contains apache service that hosts Workspace.Next files. It is needed to test Workspace.Next. -To use it call `kubectl apply --namespace=che -f wsnext/feature-api.yaml` and Che will be able to use Workspace.Next flow. diff --git a/deploy/kubernetes/kubectl/wsnext/Dockerfile b/deploy/kubernetes/kubectl/wsnext/Dockerfile deleted file mode 100644 index 73e976d192..0000000000 --- a/deploy/kubernetes/kubectl/wsnext/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -FROM alpine/git:latest as clonning -# If value is git marketplace files will be cloned from git repo in $STORAGE_REPO -# Otherwise files will be copied from $STORAGE_PATH. -# Make sure $STORAGE_PATH is in the build context -ARG STORAGE_TYPE=git -ARG STORAGE_REPO=https://github.com/garagatyi/marketplace-storage -ARG STORAGE_PATH=. -COPY $STORAGE_PATH /tmp/local-marketplace-storage -RUN mkdir /tmp/marketplace-storage && \ - if [ "$STORAGE_TYPE" == "git" ]; then \ - git clone $STORAGE_REPO /tmp/marketplace-storage; \ - else \ - cp -r /tmp/local-marketplace-storage/* /tmp/marketplace-storage/; \ - fi - -FROM centos/httpd-24-centos7 -COPY --from=clonning /tmp/marketplace-storage/ /var/www/html/ diff --git a/deploy/kubernetes/kubectl/wsnext/Readme.md b/deploy/kubernetes/kubectl/wsnext/Readme.md deleted file mode 100644 index 5d35068c08..0000000000 --- a/deploy/kubernetes/kubectl/wsnext/Readme.md +++ /dev/null @@ -1,25 +0,0 @@ -## Build marketplace docker image - -Execute -```shell -docker build --no-cache -t garagatyi/che-marketplace:os . -``` -Where `--no-cache` is needed to prevent usage of cached layers with marketplace files. -Useful when you change marketplace files and rebuild the image. - -`-t garagatyi/che-marketplace:os` is needed to set identifier of the image. -Do not forget to change `feature-api.yaml` file accordingly if you change this identifier to something else. - -## Use custome repository as a source of marketplace files - -To use a custom git repo as a source of marketplace files use next command to build the image: -```shell -docker build --no-cache -t garagatyi/che-marketplace:os --build-arg STORAGE_REPO=https://github.com/someuser/somerepo . -``` - -## Use local path as a source of marketplace files - -To use local path as a source of marketplace files use next command to build the image: -```shell -docker build --no-cache -t garagatyi/che-marketplace:os --build-arg STORAGE_TYPE=path --build-arg STORAGE_PATH=some_path_in_build_context path_to_build_context -``` diff --git a/deploy/kubernetes/kubectl/wsnext/feature-api.yaml b/deploy/kubernetes/kubectl/wsnext/feature-api.yaml deleted file mode 100644 index fdb3a00462..0000000000 --- a/deploy/kubernetes/kubectl/wsnext/feature-api.yaml +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright (c) 2012-2018 Red Hat, Inc -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# ---- -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Service - metadata: - labels: - app: marketplace - name: marketplace - spec: - ports: - - name: marketplace - port: 80 - protocol: TCP - targetPort: 8080 - selector: - app: marketplace -- apiVersion: extensions/v1beta1 - kind: Deployment - metadata: - labels: - app: marketplace - name: marketplace - spec: - replicas: 1 - revisionHistoryLimit: 2 - selector: - matchLabels: - app: marketplace - strategy: - type: Recreate - template: - metadata: - labels: - app: marketplace - spec: - containers: - - image: garagatyi/che-marketplace:os - imagePullPolicy: Always - name: marketplace-apache - ports: - - containerPort: 8080 - name: marketplace - resources: - limits: - memory: 600Mi - requests: - memory: 256Mi diff --git a/deploy/openshift/templates/README.md b/deploy/openshift/templates/README.md index 6d57d0eb75..63e5cb4829 100644 --- a/deploy/openshift/templates/README.md +++ b/deploy/openshift/templates/README.md @@ -257,9 +257,3 @@ To allow creating workspace OpenShift resources in personal OpenShift accounts, ``` -p CHE_INFRA_OPENSHIFT_PROJECT=NULL -p CHE_INFRA_OPENSHIFT_OAUTH__IDENTITY__PROVIDER=openshift-v3 ``` - - -## Workspace.Next - -There is a file `../../kubernetes/kubectl/wsnext/feature-api.yaml` which contains apache service that hosts Workspace.Next files. It is needed to test Workspace.Next. -To use it call `oc apply -f ../../kubernetes/kubectl/wsnext/feature-api.yaml` and Che will be able to use Workspace.Next flow.