updated k8s files

docker-compose.yml

@@ -3,11 +3,11 @@ services:
       
   rabbit:
     image: rabbitmq:3.8-management
-    ports:   
-      - "5671-5672:5671-5672"
-      - "15672:15672"
-      - "4369:4369"
-      - "15671:15671" 
+    #ports:   
+      #- "5671-5672:5671-5672"
+      #- "15672:15672"
+      #- "4369:4369"
+      #- "15671:15671" 
 
   mysql:
     image: mysql:5.6
@@ -16,8 +16,8 @@ services:
       MYSQL_DATABASE: semaphore
       MYSQL_USER: semaphore
       MYSQL_PASSWORD: semaphore
-    ports:
-      - "3306:3306"
+    #ports:
+      #- "3306:3306"
       
   semaphore:
     image: semaphore
@@ -34,26 +34,26 @@ services:
       SEMAPHORE_ADMIN: admin
       SEMAPHORE_WEB_ROOT: http://0.0.0.0:3000
     ports:
-      - "3000:3000"
+      - "30002:3000"
     depends_on:
       - mysql
       
       
-  logspout:
-    ports: 
-      - "30002:80"   
-    volumes:
-      - /etc/hostname:/etc/host_hostname:ro
-      - /var/run/docker.sock:/var/run/docker.sock
-    environment:
-      publish: "127.0.0.1:30002:80"
-    image: gliderlabs/logspout:latest
+  #logspout:
+    #ports: 
+      #- "30002:80"   
+    #volumes:
+      #- /etc/hostname:/etc/host_hostname:ro
+      #- /var/run/docker.sock:/var/run/docker.sock
+    #environment:
+      #publish: "127.0.0.1:30002:80"
+    #image: gliderlabs/logspout:latest
         
       
   mongo:
     image: mongo:4
-    ports:
-      - "27017:27017"         
+    #ports:
+      #- "27017:27017"         
             
     
   manager:
@@ -61,7 +61,7 @@ services:
       - rabbit
       - mongo
       - sure-tosca
-    image: manager:3.0.0 #manager:3.0.0
+    image: qcdis/manager:3.0.0 
     environment:
       RABBITMQ_HOST: rabbit
       MONGO_HOST: mongo
@@ -70,15 +70,15 @@ services:
       - "30000:8080"       
             
   sure-tosca:
-    image: sure-tosca:3.0.0
+    image: qcdis/sure-tosca:3.0.0
     ports: 
-      - "8081:8081"
+      - "30001:8081"
     
   planner:
     depends_on:
       - rabbit
       - sure-tosca
-    image: planner:3.0.0 #planner:3.0.0
+    image: qcdis/planner:3.0.0 #planner:3.0.0
     environment:
       RABBITMQ_HOST: rabbit
     
@@ -86,7 +86,7 @@ services:
     depends_on:
       - rabbit
       - sure-tosca
-    image: provisioner:3.0.0 #provisioner:3.0.0
+    image: qcdis/provisioner:3.0.0 #provisioner:3.0.0
     environment:
       RABBITMQ_HOST: rabbit      
       SURE_TOSCA_BASE_PATH: http://sure-tosca:8081/tosca-sure/1.0.0
@@ -95,7 +95,7 @@ services:
     depends_on:
       - rabbit
       - sure-tosca
-    image: deployer:3.0.0 #deployer:3.0.0
+    image: qcdis/deployer:3.0.0 #deployer:3.0.0
     environment:
       RABBITMQ_HOST: rabbit           
       SURE_TOSCA_BASE_PATH: http://sure-tosca:8081/tosca-sure/1.0.0

k8s/CONF/deployer-deployment.yaml

-apiVersion: apps/v1
+apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   annotations:
-    kompose.cmd: kompose --file docker-compose.yml convert
+    kompose.cmd: kompose convert
     kompose.version: 1.16.0 (0c01309)
   creationTimestamp: null
   labels:
     io.kompose.service: deployer
   name: deployer
 spec:
-  selector:
-    matchLabels:
-      io.kompose.service: deployer
   replicas: 1
   strategy: {}
   template:
@@ -24,9 +21,10 @@ spec:
       - env:
         - name: RABBITMQ_HOST
           value: rabbit
-        image: alogo53/deployer:3.0.0
+        - name: SURE_TOSCA_BASE_PATH
+          value: http://sure-tosca:8081/tosca-sure/1.0.0
+        image: qcdis/deployer:3.0.0
         name: deployer
-        imagePullPolicy: Always
         resources: {}
       restartPolicy: Always
 status: {}

k8s/CONF/manager-deployment.yaml

-apiVersion: apps/v1
+apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   annotations:
-    kompose.cmd: kompose --file docker-compose.yml convert
+    kompose.cmd: kompose convert
     kompose.version: 1.16.0 (0c01309)
   creationTimestamp: null
   labels:
@@ -10,9 +10,6 @@ metadata:
   name: manager
 spec:
   replicas: 1
-  selector:
-    matchLabels:
-      io.kompose.service: manager  
   strategy: {}
   template:
     metadata:
@@ -28,9 +25,8 @@ spec:
           value: rabbit
         - name: SURE_TOSCA_BASE_PATH
           value: http://sure-tosca:8081/tosca-sure/1.0.0
-        image: alogo53/manager:3.0.0
+        image: qcdis/manager:3.0.0
         name: manager
-        imagePullPolicy: Always
         ports:
         - containerPort: 8080
         resources: {}

k8s/CONF/manager-service.yaml

@@ -2,14 +2,13 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    kompose.cmd: kompose --file docker-compose.yml convert
+    kompose.cmd: kompose convert
     kompose.version: 1.16.0 (0c01309)
   creationTimestamp: null
   labels:
     io.kompose.service: manager
   name: manager
 spec:
-  type: NodePort
   ports:
     - port: 8080
       nodePort: 30000

k8s/CONF/mongo-deployment.yaml

-apiVersion: apps/v1
+apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   annotations:
-    kompose.cmd: kompose --file docker-compose.yml convert
+    kompose.cmd: kompose convert
     kompose.version: 1.16.0 (0c01309)
   creationTimestamp: null
   labels:
@@ -10,9 +10,6 @@ metadata:
   name: mongo
 spec:
   replicas: 1
-  selector:
-    matchLabels:
-      io.kompose.service: mongo      
   strategy: {}
   template:
     metadata:

k8s/CONF/mongo-service.yaml

-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    kompose.cmd: kompose --file docker-compose.yml convert
-    kompose.version: 1.16.0 (0c01309)
-  creationTimestamp: null
-  labels:
-    io.kompose.service: mongo
-  name: mongo
-spec:
-  ports:
-  - name: "27017"
-    port: 27017
-    targetPort: 27017
-  selector:
-    io.kompose.service: mongo
-status:
-  loadBalancer: {}

k8s/CONF/jupyter-deployment.yaml → k8s/CONF/mysql-deployment.yaml

-apiVersion: apps/v1
+apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   annotations:
-    kompose.cmd: kompose --file docker-compose.yml convert
+    kompose.cmd: kompose convert
     kompose.version: 1.16.0 (0c01309)
   creationTimestamp: null
   labels:
-    io.kompose.service: jupyter
-  name: jupyter
+    io.kompose.service: mysql
+  name: mysql
 spec:
   replicas: 1
-  selector:
-    matchLabels:
-      io.kompose.service: jupyter  
   strategy: {}
   template:
     metadata:
       creationTimestamp: null
       labels:
-        io.kompose.service: jupyter
+        io.kompose.service: mysql
     spec:
       containers:
       - env:
-        - name: MONGO_HOST
-          value: mongo
-        - name: RABBITMQ_HOST
-          value: rabbit
-        - name: SURE_TOSCA_BASE_PATH
-          value: http://sure-tosca:8081/tosca-sure/1.0.0
-        image: jupyter/base-notebook
-        name: jupyter
-        ports:
-        - containerPort: 8888
+        - name: MYSQL_DATABASE
+          value: semaphore
+        - name: MYSQL_PASSWORD
+          value: semaphore
+        - name: MYSQL_RANDOM_ROOT_PASSWORD
+          value: "yes"
+        - name: MYSQL_USER
+          value: semaphore
+        image: mysql:5.6
+        name: mysql
         resources: {}
       restartPolicy: Always
 status: {}

k8s/CONF/planner-deployment.yaml

-apiVersion: apps/v1
+apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   annotations:
-    kompose.cmd: kompose --file docker-compose.yml convert
+    kompose.cmd: kompose convert
     kompose.version: 1.16.0 (0c01309)
   creationTimestamp: null
   labels:
@@ -10,9 +10,6 @@ metadata:
   name: planner
 spec:
   replicas: 1
-  selector:
-    matchLabels:
-      io.kompose.service: planner    
   strategy: {}
   template:
     metadata:
@@ -24,8 +21,7 @@ spec:
       - env:
         - name: RABBITMQ_HOST
           value: rabbit
-        image: alogo53/planner:3.0.0
-        imagePullPolicy: Always
+        image: qcdis/planner:3.0.0
         name: planner
         resources: {}
       restartPolicy: Always

k8s/CONF/provisioner-deployment.yaml

-apiVersion: apps/v1
+apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   annotations:
-    kompose.cmd: kompose --file docker-compose.yml convert
+    kompose.cmd: kompose convert
     kompose.version: 1.16.0 (0c01309)
   creationTimestamp: null
   labels:
@@ -10,9 +10,6 @@ metadata:
   name: provisioner
 spec:
   replicas: 1
-  selector:
-    matchLabels:
-      io.kompose.service: provisioner    
   strategy: {}
   template:
     metadata:
@@ -26,8 +23,7 @@ spec:
           value: rabbit
         - name: SURE_TOSCA_BASE_PATH
           value: http://sure-tosca:8081/tosca-sure/1.0.0
-        image: alogo53/provisioner:3.0.0
-        imagePullPolicy: Always
+        image: qcdis/provisioner:3.0.0
         name: provisioner
         resources: {}
       restartPolicy: Always

k8s/CONF/rabbit-deployment.yaml

-apiVersion: apps/v1
+apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   annotations:
-    kompose.cmd: kompose --file docker-compose.yml convert
+    kompose.cmd: kompose convert
     kompose.version: 1.16.0 (0c01309)
   creationTimestamp: null
   labels:
@@ -10,9 +10,6 @@ metadata:
   name: rabbit
 spec:
   replicas: 1
-  selector:
-    matchLabels:
-      io.kompose.service: rabbit    
   strategy: {}
   template:
     metadata:
@@ -23,12 +20,6 @@ spec:
       containers:
       - image: rabbitmq:3.8-management
         name: rabbit
-        ports:
-        - containerPort: 5671
-        - containerPort: 5672
-        - containerPort: 15672
-        - containerPort: 4369
-        - containerPort: 15671
         resources: {}
       restartPolicy: Always
 status: {}

k8s/CONF/rabbit-service.yaml

-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    kompose.cmd: kompose --file docker-compose.yml convert
-    kompose.version: 1.16.0 (0c01309)
-  creationTimestamp: null
-  labels:
-    io.kompose.service: rabbit
-  name: rabbit
-spec:
-  ports:
-  - name: "5671"
-    port: 5671
-    targetPort: 5671
-  - name: "5672"
-    port: 5672
-    targetPort: 5672
-  - name: "15672"
-    port: 15672
-    targetPort: 15672
-  - name: "4369"
-    port: 4369
-    targetPort: 4369
-  - name: "15671"
-    port: 15671
-    targetPort: 15671
-  selector:
-    io.kompose.service: rabbit
-status:
-  loadBalancer: {}

k8s/CONF/semaphore-deployment.yaml

+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  annotations:
+    kompose.cmd: kompose convert
+    kompose.version: 1.16.0 (0c01309)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: semaphore
+  name: semaphore
+spec:
+  replicas: 1
+  strategy: {}
+  template:
+    metadata:
+      creationTimestamp: null
+      labels:
+        io.kompose.service: semaphore
+    spec:
+      containers:
+      - env:
+        - name: SEMAPHORE_ADMIN
+          value: admin
+        - name: SEMAPHORE_ADMIN_EMAIL
+          value: admin@localhost
+        - name: SEMAPHORE_ADMIN_NAME
+          value: Developer
+        - name: SEMAPHORE_ADMIN_PASSWORD
+          value: password
+        - name: SEMAPHORE_DB
+          value: semaphore
+        - name: SEMAPHORE_DB_HOST
+          value: mysql
+        - name: SEMAPHORE_DB_PASS
+          value: semaphore
+        - name: SEMAPHORE_DB_PORT
+          value: "3306"
+        - name: SEMAPHORE_DB_USER
+          value: semaphore
+        - name: SEMAPHORE_PLAYBOOK_PATH
+          value: /etc/semaphore
+        - name: SEMAPHORE_WEB_ROOT
+          value: http://0.0.0.0:3000
+        image: semaphore
+        name: semaphore
+        ports:
+        - containerPort: 3000
+        resources: {}
+      restartPolicy: Always
+status: {}

k8s/CONF/jupyter-service.yaml → k8s/CONF/semaphore-service.yaml

@@ -2,18 +2,18 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    kompose.cmd: kompose --file docker-compose.yml convert
+    kompose.cmd: kompose convert
     kompose.version: 1.16.0 (0c01309)
   creationTimestamp: null
   labels:
-    io.kompose.service: jupyter
-  name: jupyter
+    io.kompose.service: semaphore
+  name: semaphore
 spec:
   type: NodePort
   ports:
-    - port: 8888
-      nodePort: 30003
+    - port: 3000
+      nodePort: 30002
   selector:
-    io.kompose.service: jupyter
+    io.kompose.service: semaphore
 status:
   loadBalancer: {}

k8s/CONF/sure-tosca-deployment.yaml

-apiVersion: apps/v1
+apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   annotations:
-    kompose.cmd: kompose --file docker-compose.yml convert
+    kompose.cmd: kompose convert
     kompose.version: 1.16.0 (0c01309)
   creationTimestamp: null
   labels:
@@ -10,9 +10,6 @@ metadata:
   name: sure-tosca
 spec:
   replicas: 1
-  selector:
-    matchLabels:
-      io.kompose.service: sure-tosca    
   strategy: {}
   template:
     metadata:
@@ -21,9 +18,10 @@ spec:
         io.kompose.service: sure-tosca
     spec:
       containers:
-      - image: alogo53/sure-tosca:3.0.0
+      - image: qcdis/sure-tosca:3.0.0
         name: sure-tosca
-        imagePullPolicy: Always
+        ports:
+        - containerPort: 8081
         resources: {}
       restartPolicy: Always
 status: {}

k8s/CONF/sure-tosca-service.yaml

@@ -2,17 +2,17 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    kompose.cmd: kompose --file docker-compose.yml convert
+    kompose.cmd: kompose convert
     kompose.version: 1.16.0 (0c01309)
   creationTimestamp: null
   labels:
     io.kompose.service: sure-tosca
   name: sure-tosca
 spec:
+  type: NodePort
   ports:
-  - name: "8081"
-    port: 8081
-    targetPort: 8081
+    - port: 8081
+      nodePort: 30001
   selector:
     io.kompose.service: sure-tosca
 status: