Requeted changes:

- Removed setup_infra in favor of function in main script
- Moved setup_gitter into main script function
- Removed istio from resources
- Improved docs
- Added required env to .profile-example

Author: cs-marek-ruszczyk

.profile-example

@@ -10,3 +10,7 @@ export workshopNamespace=workshop
 # export sessionSecret=cloudnative1337
 # export clusterName=workshop
 # export gitrepo=https://github.com/ContainerSolutions/timber.git
+
+## Required for gitter self-serivce portal (get them here: https://developer.gitter.im/apps/new)
+# export GITTER_OAUTH_KEY=xx
+# export GITTER_OAUTH_SECRET=xxx

gitter.env.sample

@@ -5,6 +5,13 @@ preinstalled, and authenticated against the CS account.
 Just use this url: [CloudShell](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/lalyos/k8s-workshop&tutorial=infra-setup.md
 )
 
+## Changelog 2020-02-17
+
+- Added code-server, exposed via domain on ide.userXX.${domain}
+- Migrated gotty shell to shell.userXX.${domain}
+- Added function setup-gitter
+- Extended timeout from 60s to 3600s for long live proxy connection via ingress (should fix connection dropping while using ingress)
+
 ## ChangeLog 2019-10-25
 
 - cluster creation is moved to a function `start-cluster`
@@ -16,7 +23,7 @@ Just use this url: [CloudShell](https://console.cloud.google.com/cloudshell/open
   - defPoolSize (3)
   - preemPoolSize (3)
   - zone (europe-west3-b)
-- istio and http lb is switched of by default (speedup start) - see: 403bc36d8c25f6173e04b8fca0d1a0c5a96c1601
+- istio and http lb is switched off by default (speedup start) - see: 403bc36d8c25f6173e04b8fca0d1a0c5a96c1601
 
 ## Configure Project
 
@@ -48,7 +55,7 @@ source workshop-functions.sh
 ```
 
 Now you can create the GKE cluster. All config will be printed,
-and you have a chance to review and cancel.
+and you have a chance to review and cancel. This will also automatically import cluster config
 ```
 start-cluster
 ```
@@ -58,11 +65,6 @@ checking the GKE cluster
 gcloud container clusters list
 ```
 
-get kubectl credentials
-```
-gcloud container clusters get-credentials workshop --zone=${zone}
-```
-
 ## Initial setup
 
 At the begining you have to create some cluster roles :
@@ -115,7 +117,7 @@ dev user0
 ```
 Please note, the first couple may take more time, as the docker image should be pulled on each node.
 
-To create more user sssions use the following line
+To create more user sessions use the following line
 ```
 for u in user{2..15}; do dev $u; done
 ```

infra-setup.md

@@ -6,30 +6,17 @@ Since we use basic auth now, the urls are simple (like userX.domain.com).
 Of course now you have to distribute the credentials, but hey you can use
 the same password for everybody ;)
 
-## Self Service portal - depricated
+## Self Service portal v2 (WIP) 
 
 After creating the user sessions, its hard to distribute/assign the session urls.
 
 There is a small gitter authentication based web app, where participants can get an unused
 session assigned to them.
 More details and the process toget GITTER credentials is described: https://github.com/lalyos/gitter-scripter
 
+Run this line to setup gitter, don't forget to update .profile with credentials
+```bash
+setup-gitter
 ```
-export GITTER_OAUTH_KEY=xxxxxxx
-export GITTER_OAUTH_SECRET=yyyyyyy
-kubectl create secret generic gitter \
-  --from-literal=GITTER_OAUTH_KEY=$GITTER_OAUTH_KEY \
-  --from-literal=GITTER_OAUTH_SECRET=$GITTER_OAUTH_SECRET
-# todo automate setting of gitter room:
 
-export workshopNamespace=workshop
-export domain=k8z.eu
-curl -sL https://raw.githubusercontent.com/lalyos/gitter-scripter/master/gitter-template.yaml \
-  | envsubst \
-  | kubectl apply -f -
-
-export gitterRoom=lalyos/earthport
-kubectl patch deployments gitter --patch '{"spec":{"template":{"spec":{"$setElementOrder/containers":[{"name":"gitter"}],"containers":[{"$setElementOrder/env":[{"name":"GITTER_ROOM_NAME"},{"name":"DOMAIN"}],"env":[{"name":"GITTER_ROOM_NAME","value":"'${gitterRoom}'"}],"name":"gitter"}]}}}}'
-```
-
-The users can self service at: http://session.k8z.eu
+The users can self service at: http://session.${domain}

ingress_istio.yaml

@@ -18,38 +18,6 @@ metadata:
 ---
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1beta1
-metadata:
-  name: role-${namespace}
-  namespace: istio-system
-  labels:
-    user: "${namespace}"
-rules:
-- apiGroups: [""]
-  resources:
-  - services
-  - pods
-  verbs:
-  - get
-  - list
----
-kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
-metadata:
-  name: rb-${namespace}
-  namespace: istio-system
-  labels:
-    user: "${namespace}"
-subjects:
-- kind: ServiceAccount
-  name: sa-${namespace}
-  namespace: ${workshopNamespace}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: role-${namespace}
----
-kind: Role
-apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: role-${namespace}
   namespace: ${namespace}
@@ -64,12 +32,6 @@ rules:
   - jobs
   - cronjobs
   verbs: ["*"]
-- apiGroups: ["networking.istio.io"]
-  resources:
-  - virtualservices
-  - gateways
-  - destinationrules
-  verbs: ["*"]
 - apiGroups: ["rbac.authorization.k8s.io"]
   resources:
   - roles
@@ -109,7 +71,7 @@ metadata:
 subjects:
 - kind: ServiceAccount
   name: default
-  namespace: ${mamespace}
+  namespace: ${namespace}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -135,7 +97,6 @@ namespace() {
 
     kubectl create ns ${namespace}
     kubectl label ns ${namespace} user=${namespace} 
-    kubectl label ns ${namespace} istio-injection=enabled
     assign-role-to-ns ${namespace} | kubectl create -f -
 
     kubectl create clusterrolebinding crb-${namespace} --clusterrole=lister --serviceaccount=${workshopNamespace}:sa-${namespace}
@@ -543,10 +504,11 @@ start-cluster() {
   : ${defPoolSize:=3}
   : ${preemPoolSize:=3}
 
+  project_id="container-solutions-workshops"
   confirm-config
 
   gcloud beta container \
-      --project "container-solutions-workshops" \
+      --project "${project_id}" \
       clusters create "${clusterName}" \
       --zone "${zone}" \
       --username "admin" \
@@ -565,7 +527,7 @@ start-cluster() {
       --enable-autoupgrade \
       --enable-autorepair \
  && gcloud beta container \
-      --project "container-solutions-workshops" \
+      --project "${project_id}" \
       node-pools create "pool-1" \
       --cluster "${clusterName}" \
       --zone "${zone}" \
@@ -580,8 +542,33 @@ start-cluster() {
       --num-nodes "${preemPoolSize}" \
       --no-enable-autoupgrade \
       --enable-autorepair
+
+      gcloud  container clusters get-credentials "${clusterName}" --project "${project_id}" --zone "${zone}"
+
 }
 
+setup-gitter() {
+
+   : ${workshopNamespace:? required}
+   : ${gitterRoom:? required}
+   : ${GITTER_OAUTH_KEY:? required}
+   : ${GITTER_OAUTH_SECRET:? required}
+
+
+    echo "Import gitter keys from gitter.env"
+    echo "Create secrets"
+    kubectl create secret generic gitter \
+      --from-literal=GITTER_OAUTH_KEY=$GITTER_OAUTH_KEY \
+      --from-literal=GITTER_OAUTH_SECRET=$GITTER_OAUTH_SECRET
+
+    curl -sL https://raw.githubusercontent.com/lalyos/gitter-scripter/master/gitter-template.yaml \
+      | envsubst \
+      | kubectl apply -f -
+
+    kubectl patch deployments gitter --patch '{"spec":{"template":{"spec":{"$setElementOrder/containers":[{"name":"gitter"}],"containers":[{"$setElementOrder/env":[{"name":"GITTER_ROOM_NAME"},{"name":"DOMAIN"}],"env":[{"name":"GITTER_ROOM_NAME","value":"'${gitterRoom}'"}],"name":"gitter"}]}}}}'
+
+}}
+
 [[ -e .profile ]] && source .profile || true
 
 main() {