bye bye rest2tasks

.flowconfig

@@ -12,7 +12,6 @@
 <PROJECT_ROOT>/services/openshiftbuilddeploy/
 <PROJECT_ROOT>/services/openshiftbuilddeploymonitor/
 <PROJECT_ROOT>/services/openshiftremove/
-<PROJECT_ROOT>/services/rest2tasks/
 <PROJECT_ROOT>/services/webhook-handler/
 <PROJECT_ROOT>/services/webhooks2tasks/
 

Makefile

@@ -432,7 +432,6 @@ services :=       api \
 									openshiftmisc \
 									openshiftremove \
 									kubernetesbuilddeploy \
-									rest2tasks \
 									webhook-handler \
 									webhooks2tasks \
 									broker \
@@ -482,7 +481,7 @@ $(build-services-galera):
 	touch $@
 
 # Dependencies of Service Images
-build/auth-server build/logs2email build/logs2slack build/logs2rocketchat build/logs2microsoftteams build/openshiftbuilddeploy build/openshiftbuilddeploymonitor build/openshiftjobs build/openshiftjobsmonitor build/openshiftmisc build/openshiftremove build/kubernetesbuilddeploy build/rest2tasks build/webhook-handler build/webhooks2tasks build/api build/cli build/ui: build/yarn-workspace-builder
+build/auth-server build/logs2email build/logs2slack build/logs2rocketchat build/logs2microsoftteams build/openshiftbuilddeploy build/openshiftbuilddeploymonitor build/openshiftjobs build/openshiftjobsmonitor build/openshiftmisc build/openshiftremove build/kubernetesbuilddeploy build/webhook-handler build/webhooks2tasks build/api build/cli build/ui: build/yarn-workspace-builder
 build/logs2logs-db: build/logstash__7
 build/logs-db: build/elasticsearch__7.1
 build/logs-db-ui: build/kibana__7.1

docker-compose.end2end.yaml

@@ -6,9 +6,6 @@ services:
       - WEBHOOK_PORT=443
       - WEBHOOK_PROTOCOL=https
       - OPENSHIFT_ROUTE_SUFFIX=ch.amazee.io
-      - REST2TASKS_HOST=rest2tasks-lagoon-master.lagoon.ch.amazee.io
-      - REST2TASKS_PORT=443
-      - REST2TASKS_PROTOCOL=https
       - [email protected]:lagoon-end2end-ci/
       - [email protected]:lagoon-end2end-ci/
       - SSH_PRIVATE_KEY=-----BEGIN RSA PRIVATE KEY-----\n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\n-----END RSA PRIVATE KEY-----

docker-compose.yaml

@@ -188,18 +188,6 @@ services:
       lagoon.type: custom
       lagoon.template: services/webhooks2tasks/.lagoon.app.yml
       lagoon.image: amazeeiolagoon/webhooks2tasks:v1-2-0
-  rest2tasks:
-    image: ${IMAGE_REPO:-lagoon}/rest2tasks
-    command: yarn run dev
-    volumes:
-      - ./services/rest2tasks/src:/app/services/rest2tasks/src
-      - ./node-packages:/app/node-packages:delegated
-    ports:
-      - '5555:3000'
-    labels:
-      lagoon.type: custom
-      lagoon.template: services/rest2tasks/.lagoon.app.yml
-      lagoon.image: amazeeiolagoon/rest2tasks:v1-2-0
   api:
     image: ${IMAGE_REPO:-lagoon}/api
     command: yarn run dev

docs/administering_lagoon/install.md

@@ -66,7 +66,7 @@ In order to use a local Lagoon to deploy itself on an OpenShift, we need a subse
     4. So the local running Lagoon service `openshiftBuildDeploy` connects to this OpenShift and creates a new project, some needed configurations (ServiceAccounts, BuildConfigs, etc.) and triggers a new Build.
     5. This Build will run and deploy another Lagoon within the OpenShift it runs.
 
-6.  As soon as the build is done, go to the `Application > Deployments` section of the OpenShift Project and you should see all the Lagoon Deployment Configs deployed and running. Also go to `Application > Routes` and click on the generated route for `rest2tasks` (for a local OpenShift this will be <http://rest2tasks-lagoon-develop.192.168.42.100.xip.io/>), if you get `welcome to rest2tasks` as result, you did everything correct, bravo!
+6.  As soon as the build is done, go to the `Application > Deployments` section of the OpenShift Project and you should see all the Lagoon Deployment Configs deployed and running. Also go to `Application > Routes` and click on the generated route for `ui` (for a local OpenShift this will be <http://ui-lagoon-develop.192.168.42.100.xip.io/>), if you get the Lagoon UI as result, you did everything correct, bravo!
 
 ### OpendistroSecurity
 

images/yarn-workspace-builder/Dockerfile

@@ -20,7 +20,6 @@ COPY services/openshiftbuilddeploy/package.json /app/services/openshiftbuilddepl
 COPY services/openshiftbuilddeploymonitor/package.json /app/services/openshiftbuilddeploymonitor/
 COPY services/openshiftremove/package.json /app/services/openshiftremove/
 COPY services/kubernetesbuilddeploy/package.json /app/services/kubernetesbuilddeploy/
-COPY services/rest2tasks/package.json /app/services/rest2tasks/
 COPY services/webhook-handler/package.json /app/services/webhook-handler/
 COPY services/webhooks2tasks/package.json /app/services/webhooks2tasks/
 COPY services/ui/package.json /app/services/ui/

local-dev/api-data/03-populate-api-data-kubernetes.gql

@@ -9,7 +9,7 @@ mutation PopulateApi {
       routerPattern: "${project}.${branch}.172.17.0.1.xip.io"
       sshHost: "172.17.0.1"
       sshPort: "2020"
-      token: "eyJhbGciOiJSUzI1NiIsImtpZCI6InFhU2tLWEtIejJRYlVJS0tTUUNRRjBMb285VHE3ZXFCTmM5ZjdjTkdfSkUifQ.eyJpc3MiOiJrdWJlcm5ldGVzL3NlcnZpY2VhY2NvdW50Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9uYW1lc3BhY2UiOiJsYWdvb24iLCJrdWJlcm5ldGVzLmlvL3NlcnZpY2VhY2NvdW50L3NlY3JldC5uYW1lIjoia3ViZXJuZXRlc2J1aWxkZGVwbG95LXRva2VuLXdzbWhuIiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9zZXJ2aWNlLWFjY291bnQubmFtZSI6Imt1YmVybmV0ZXNidWlsZGRlcGxveSIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VydmljZS1hY2NvdW50LnVpZCI6IjU3M2M4ZjBlLWYxZjItNDdlNS04MGRlLWNmOTVlMThjODI2OSIsInN1YiI6InN5c3RlbTpzZXJ2aWNlYWNjb3VudDpsYWdvb246a3ViZXJuZXRlc2J1aWxkZGVwbG95In0.Cls1S6eYmqVLKGoEO47Z9w8cpWb_PhYLYl2q3ouz6PlSEiHBqZYHbKeJ4kL7_c5JA-bdIzfh-EIS_wBvLWnkqz1MnWwTGtAhKY2FWIIUrSehpKjz1mYlEqKbU-_bCPFY4TSEQ5AhXUCjOZb6aQfscrNaWCizFdM89bPWWTD603JYL8HiZPYzpmZ8lpUwg4WZ3qFLqctJbNjhcdar2O0nXpv2vMVlNs3vLxncoVjKGvo_02vHxY9eaMXsID8txfNfjnA9ZreGmVVbFrDGQIQzNIwz6uGErcO1YCURB37UVJgoq8ou8B8tj-KPcS3TkURYiwde2ylZpNYlcFYLVom6bQ" # make-kubernetes-token
+      token: "eyJhbGciOiJSUzI1NiIsImtpZCI6Ink0RGZGSHJJRHoxTzNkRUxLOGxybTFOeDZJS28zMkpZV3U5OGczb04wS2cifQ.eyJpc3MiOiJrdWJlcm5ldGVzL3NlcnZpY2VhY2NvdW50Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9uYW1lc3BhY2UiOiJsYWdvb24iLCJrdWJlcm5ldGVzLmlvL3NlcnZpY2VhY2NvdW50L3NlY3JldC5uYW1lIjoia3ViZXJuZXRlc2J1aWxkZGVwbG95LXRva2VuLTZ2NHpiIiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9zZXJ2aWNlLWFjY291bnQubmFtZSI6Imt1YmVybmV0ZXNidWlsZGRlcGxveSIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VydmljZS1hY2NvdW50LnVpZCI6IjMyMzk5NDY4LTYzYjktNGM1OC1hZDRhLTE1ZDI5MGZjZTBmNCIsInN1YiI6InN5c3RlbTpzZXJ2aWNlYWNjb3VudDpsYWdvb246a3ViZXJuZXRlc2J1aWxkZGVwbG95In0.M7TmowrmZdZabkvXq1EgTmfzjEZR_OFKEyBthPqs0GbFOJGBb2qn8VFwVG950fkYKSnF7qkR4TKWh6FrsU9IVZWDStIv41wYLwQvDJX7sjBiu3cC1H5aLKuq5EnGS2Kgz5S4SgIsc6APCdjc7UTrAhslA1ZNjvMDZgckKu17O61XFxBt-wMt5x6L3lMuFwopR_oZM791h6zcm61GpcZk5iQjxopKQzjhxeD60BsgMpLW7hGI2ZGGH5RKvVgrIGrD6KBhx0VMaAOhCG4NC1IUjwj7Z3fiuqP6BxDIqgGuc5K7ZWJbrouypNQLajwITft6iFbRUFNOIl1l2wu316QCZA" # make-kubernetes-token
     }
   ) {
     id

openshift-setup/force-one-pod.yaml

@@ -212,20 +212,6 @@ spec:
     name: openshiftremove
   targetCPUUtilizationPercentage: 80
 
----
-apiVersion: autoscaling/v1
-kind: HorizontalPodAutoscaler
-metadata:
-  name: rest2tasks
-spec:
-  maxReplicas: 1
-  minReplicas: 1
-  scaleTargetRef:
-    apiVersion: v1
-    kind: DeploymentConfig
-    name: rest2tasks
-  targetCPUUtilizationPercentage: 80
-
 ---
 apiVersion: autoscaling/v1
 kind: HorizontalPodAutoscaler