Adding datacenter and peer support in k8s

opencloud/dev-values.yaml

@@ -281,6 +281,63 @@ ocWorkspace:
       cpu: "128m"
       memory: "256Mi"
 
+ocShared:
+  enabled: true
+  image: oc/oc-shared:0.0.1
+  resources:
+    limits:
+      cpu: "128m"
+      memory: "256Mi"
+    requests:
+      cpu: "128m"
+      memory: "256Mi"
+
+ocWorkflow:
+  enabled: true
+  image: oc/oc-workflow:0.0.1
+  resources:
+    limits:
+      cpu: "128m"
+      memory: "256Mi"
+    requests:
+      cpu: "128m"
+      memory: "256Mi"
+
+ocCatalog:
+  enabled: true
+  image: oc/oc-catalog:0.0.1
+  resources:
+    limits:
+      cpu: "128m"
+      memory: "256Mi"
+    requests:
+      cpu: "128m"
+      memory: "256Mi"
+
+ocPeer:
+  enabled: true
+  image: oc/oc-peer:0.0.1
+  resources:
+    limits:
+      cpu: "128m"
+      memory: "256Mi"
+    requests:
+      cpu: "128m"
+      memory: "256Mi"
+
+ocDatacenter:
+  enabled: true
+  image: oc/oc-datacenter:0.0.1
+  resources:
+    limits:
+      cpu: "128m"
+      memory: "256Mi"
+    requests:
+      cpu: "128m"
+      memory: "256Mi"
+
+
+
 loki:
   enabled: false
 

opencloud/templates/oc-catalog/deployment.yaml

@@ -0,0 +1,35 @@
+{{- if index .Values.ocCatalog.enabled }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: oc-catalog
+  name: {{ .Release.Name }}-oc-catalog
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: oc-catalog
+  template:
+    metadata:
+      labels:
+        app: oc-catalog
+    spec:
+      containers:
+      - image: "{{ .Values.ocCatalog.image }}"
+        name: oc-catalog
+        envFrom:
+        - configMapRef:
+            name: opencloud-config
+        ports:
+          - name: http
+            containerPort: 8080
+            protocol: TCP
+        resources:
+          limits:
+            cpu: "{{ .Values.ocCatalog.resources.limits.cpu }}"
+            memory: "{{ .Values.ocCatalog.resources.limits.memory }}"
+          requests:
+            cpu: "{{ .Values.ocCatalog.resources.requests.cpu }}"
+            memory: "{{ .Values.ocCatalog.resources.requests.memory }}"
+  {{- end }}

opencloud/templates/oc-catalog/ingress.yaml

@@ -0,0 +1,29 @@
+{{- if index .Values.ocCatalog.enabled }}
+apiVersion: traefik.io/v1alpha1
+kind: IngressRoute
+metadata:
+  name: oc-catalog-ingress
+spec:
+  entryPoints:
+    - web
+  routes:                           
+    - kind: Rule
+      match:   Host(`{{ .Values.host }}`) && PathPrefix(`/catalog`)
+      priority: 10                    
+      services:
+      - kind: Service
+        name: oc-catalog-svc
+        port: 8080
+      middlewares:
+      - name: strip-catalog-prefix
+
+---
+apiVersion:  traefik.io/v1alpha1
+kind: Middleware
+metadata:
+  name: strip-catalog-prefix
+spec:
+  stripPrefix:
+    prefixes:
+      - "/catalog"
+{{- end }}

opencloud/templates/oc-catalog/service.yaml

@@ -0,0 +1,17 @@
+{{- if index .Values.ocCatalog.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: oc-catalog-svc
+  labels:
+    app: oc-catalog-svc
+spec:
+  ports:
+  - name: http
+    port: 8080
+    protocol: TCP
+    targetPort: 8080
+  selector:
+    app: oc-catalog
+  type: ClusterIP
+{{- end }}

opencloud/templates/oc-datacenter/deployment.yaml

@@ -0,0 +1,35 @@
+{{- if index .Values.ocDatacenter.enabled }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: oc-datacenter
+  name: {{ .Release.Name }}-oc-datacenter
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: oc-datacenter
+  template:
+    metadata:
+      labels:
+        app: oc-datacenter
+    spec:
+      containers:
+      - image: "{{ .Values.ocDatacenter.image }}"
+        name: oc-datacenter
+        envFrom:
+        - configMapRef:
+            name: opencloud-config
+        ports:
+          - name: http
+            containerPort: 8080
+            protocol: TCP
+        resources:
+          limits:
+            cpu: "{{ .Values.ocDatacenter.resources.limits.cpu }}"
+            memory: "{{ .Values.ocDatacenter.resources.limits.memory }}"
+          requests:
+            cpu: "{{ .Values.ocDatacenter.resources.requests.cpu }}"
+            memory: "{{ .Values.ocDatacenter.resources.requests.memory }}"
+  {{- end }}

opencloud/templates/oc-datacenter/ingress.yaml

@@ -0,0 +1,29 @@
+{{- if index .Values.ocDatacenter.enabled }}
+apiVersion: traefik.io/v1alpha1
+kind: IngressRoute
+metadata:
+  name: oc-datacenter-ingress
+spec:
+  entryPoints:
+    - web
+  routes:                           
+    - kind: Rule
+      match:   Host(`{{ .Values.host }}`) && PathPrefix(`/datacenter`)
+      priority: 10                    
+      services:
+      - kind: Service
+        name: oc-datacenter-svc
+        port: 8080
+      middlewares:
+      - name: strip-datacenter-prefix
+
+---
+apiVersion:  traefik.io/v1alpha1
+kind: Middleware
+metadata:
+  name: strip-datacenter-prefix
+spec:
+  stripPrefix:
+    prefixes:
+      - "/datacenter"
+{{- end }}

opencloud/templates/oc-datacenter/service.yaml

@@ -0,0 +1,17 @@
+{{- if index .Values.ocDatacenter.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: oc-datacenter-svc
+  labels:
+    app: oc-datacenter-svc
+spec:
+  ports:
+  - name: http
+    port: 8080
+    protocol: TCP
+    targetPort: 8080
+  selector:
+    app: oc-datacenter
+  type: ClusterIP
+{{- end }}

opencloud/templates/oc-front/config.yaml

@@ -8,12 +8,12 @@ data:
     {
       "WORKSPACE_HOST": "{{ .Values.scheme }}://{{ .Values.host }}/workspace/oc",
       "WORKFLOW_HOST": "{{ .Values.scheme }}://{{ .Values.host }}/workflow/oc",
-      "ITEM_HOST": "{{ .Values.scheme }}://{{ .Values.host }}/item/oc",
+      "ITEM_HOST": "{{ .Values.scheme }}://{{ .Values.host }}/catalog/oc",
       "SCHEDULER_HOST": "{{ .Values.scheme }}://{{ .Values.host }}/scheduler/oc",
       "LOGS_HOST": "{{ .Values.scheme }}://{{ .Values.host }}/logs",
       "PEER_HOST": "{{ .Values.scheme }}://{{ .Values.host }}/peers/oc",
       "DATACENTER_HOST": "{{ .Values.scheme }}://{{ .Values.host }}/datacenter/oc",
-      "COLLABORATIVE_AREA_HOST": "{{ .Values.scheme }}://{{ .Values.host }}/collaborative/oc",
+      "COLLABORATIVE_AREA_HOST": "{{ .Values.scheme }}://{{ .Values.host }}/shared/oc",
       "HOST": "{{ .Values.scheme }}://{{ .Values.host }}/oc",
       "AUTH_HOST": "{{ .Values.scheme }}://{{ .Values.host }}/auth/oc"
     }

opencloud/templates/oc-front/ingress.yaml

@@ -9,7 +9,7 @@ spec:
   routes:                           
     - kind: Rule
       match:   Host(`{{ .Values.host }}`) && PathPrefix(`/`)
-      priority: 10                    
+      priority: 5
       services:
       - kind: Service
         name: oc-front-svc

opencloud/templates/oc-peer/deployment.yaml

@@ -0,0 +1,35 @@
+{{- if index .Values.ocPeer.enabled }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: oc-peer
+  name: {{ .Release.Name }}-oc-peer
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: oc-peer
+  template:
+    metadata:
+      labels:
+        app: oc-peer
+    spec:
+      containers:
+      - image: "{{ .Values.ocPeer.image }}"
+        name: oc-peer
+        envFrom:
+        - configMapRef:
+            name: opencloud-config
+        ports:
+          - name: http
+            containerPort: 8080
+            protocol: TCP
+        resources:
+          limits:
+            cpu: "{{ .Values.ocPeer.resources.limits.cpu }}"
+            memory: "{{ .Values.ocPeer.resources.limits.memory }}"
+          requests:
+            cpu: "{{ .Values.ocPeer.resources.requests.cpu }}"
+            memory: "{{ .Values.ocPeer.resources.requests.memory }}"
+  {{- end }}

opencloud/templates/oc-peer/ingress.yaml

@@ -0,0 +1,29 @@
+{{- if index .Values.ocPeer.enabled }}
+apiVersion: traefik.io/v1alpha1
+kind: IngressRoute
+metadata:
+  name: oc-peer-ingress
+spec:
+  entryPoints:
+    - web
+  routes:                           
+    - kind: Rule
+      match:   Host(`{{ .Values.host }}`) && PathPrefix(`/peers`)
+      priority: 10                    
+      services:
+      - kind: Service
+        name: oc-peer-svc
+        port: 8080
+      middlewares:
+      - name: strip-peer-prefix
+
+---
+apiVersion:  traefik.io/v1alpha1
+kind: Middleware
+metadata:
+  name: strip-peer-prefix
+spec:
+  stripPrefix:
+    prefixes:
+      - "/peers"
+{{- end }}

opencloud/templates/oc-peer/service.yaml

@@ -0,0 +1,17 @@
+{{- if index .Values.ocPeer.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: oc-peer-svc
+  labels:
+    app: oc-peer-svc
+spec:
+  ports:
+  - name: http
+    port: 8080
+    protocol: TCP
+    targetPort: 8080
+  selector:
+    app: oc-peer
+  type: ClusterIP
+{{- end }}

opencloud/templates/oc-shared/deployment.yaml

@@ -0,0 +1,35 @@
+{{- if index .Values.ocShared.enabled }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: oc-shared
+  name: {{ .Release.Name }}-oc-shared
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: oc-shared
+  template:
+    metadata:
+      labels:
+        app: oc-shared
+    spec:
+      containers:
+      - image: "{{ .Values.ocShared.image }}"
+        name: oc-shared
+        envFrom:
+        - configMapRef:
+            name: opencloud-config
+        ports:
+          - name: http
+            containerPort: 8080
+            protocol: TCP
+        resources:
+          limits:
+            cpu: "{{ .Values.ocShared.resources.limits.cpu }}"
+            memory: "{{ .Values.ocShared.resources.limits.memory }}"
+          requests:
+            cpu: "{{ .Values.ocShared.resources.requests.cpu }}"
+            memory: "{{ .Values.ocShared.resources.requests.memory }}"
+  {{- end }}

opencloud/templates/oc-shared/ingress.yaml

@@ -0,0 +1,29 @@
+{{- if index .Values.ocShared.enabled }}
+apiVersion: traefik.io/v1alpha1
+kind: IngressRoute
+metadata:
+  name: oc-shared-ingress
+spec:
+  entryPoints:
+    - web
+  routes:                           
+    - kind: Rule
+      match:   Host(`{{ .Values.host }}`) && PathPrefix(`/shared`)
+      priority: 10                    
+      services:
+      - kind: Service
+        name: oc-shared-svc
+        port: 8080
+      middlewares:
+      - name: strip-shared-prefix
+
+---
+apiVersion:  traefik.io/v1alpha1
+kind: Middleware
+metadata:
+  name: strip-shared-prefix
+spec:
+  stripPrefix:
+    prefixes:
+      - "/shared"
+{{- end }}

opencloud/templates/oc-shared/service.yaml

@@ -0,0 +1,17 @@
+{{- if index .Values.ocShared.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: oc-shared-svc
+  labels:
+    app: oc-shared-svc
+spec:
+  ports:
+  - name: http
+    port: 8080
+    protocol: TCP
+    targetPort: 8080
+  selector:
+    app: oc-shared
+  type: ClusterIP
+{{- end }}

opencloud/templates/oc-workflow/deployment.yaml

@@ -0,0 +1,35 @@
+{{- if index .Values.ocWorkflow.enabled }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: oc-workflow
+  name: {{ .Release.Name }}-oc-workflow
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: oc-workflow
+  template:
+    metadata:
+      labels:
+        app: oc-workflow
+    spec:
+      containers:
+      - image: "{{ .Values.ocWorkflow.image }}"
+        name: oc-shared
+        envFrom:
+        - configMapRef:
+            name: opencloud-config
+        ports:
+          - name: http
+            containerPort: 8080
+            protocol: TCP
+        resources:
+          limits:
+            cpu: "{{ .Values.ocWorkflow.resources.limits.cpu }}"
+            memory: "{{ .Values.ocWorkflow.resources.limits.memory }}"
+          requests:
+            cpu: "{{ .Values.ocWorkflow.resources.requests.cpu }}"
+            memory: "{{ .Values.ocWorkflow.resources.requests.memory }}"
+  {{- end }}

opencloud/templates/oc-workflow/ingress.yaml

@@ -0,0 +1,29 @@
+{{- if index .Values.ocWorkflow.enabled }}
+apiVersion: traefik.io/v1alpha1
+kind: IngressRoute
+metadata:
+  name: oc-workflow-ingress
+spec:
+  entryPoints:
+    - web
+  routes:                           
+    - kind: Rule
+      match:   Host(`{{ .Values.host }}`) && PathPrefix(`/workflow`)
+      priority: 10                    
+      services:
+      - kind: Service
+        name: oc-workflow-svc
+        port: 8080
+      middlewares:
+      - name: strip-workflow-prefix
+
+---
+apiVersion:  traefik.io/v1alpha1
+kind: Middleware
+metadata:
+  name: strip-workflow-prefix
+spec:
+  stripPrefix:
+    prefixes:
+      - "/workflow"
+{{- end }}

opencloud/templates/oc-workflow/service.yaml

@@ -0,0 +1,17 @@
+{{- if index .Values.ocWorkflow.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: oc-workflow-svc
+  labels:
+    app: oc-workflow-svc
+spec:
+  ports:
+  - name: http
+    port: 8080
+    protocol: TCP
+    targetPort: 8080
+  selector:
+    app: oc-workflow
+  type: ClusterIP
+{{- end }}