roles roles roles

Chart.yaml

@@ -14,8 +14,8 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 0.1.3
+version: 0.1.6
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 0.1.0
+appVersion: 0.1.1

templates/job_orchestrator_deployment.yaml

@@ -47,13 +47,21 @@ data:
   SENTRY_DSN: "{{ .Values.jobOrchestrator.sentry_dsn }}"
   URSIM_CONTROL_IMAGE: "registry.kmlabz.com/universalrobots/single_ursim_control:latest"
   URSIM_CONTROL_CONFIGMAP: "single-ursim-controller-config"
+  LINK_QUALITY_REPORT_URL: "{{ .Values.jobOrchestrator.link_quality_report_url }}"
 ---
-apiVersion: v1
-kind: ConfigMap
+apiVersion: types.kubefed.io/v1beta1
+kind: FederatedConfigMap
 metadata:
   name: single-ursim-controller-config
-data:
-  DRY_RUN: "{{ .Values.singleURSimControl.dry_run }}"
-  REDIS_URL: "redis://controller-redis/0"
-  SENTRY_DSN: "{{ .Values.singleURSimControl.sentry_dsn }}"
-  DEBUG: "{{ .Values.singleURSimControl.debug }}"
+spec:
+  template:
+    data:
+      DRY_RUN: "{{ .Values.singleURSimControl.dry_run }}"
+      REDIS_URL: "redis://controller-redis/0"
+      SENTRY_DSN: "{{ .Values.singleURSimControl.sentry_dsn }}"
+      DEBUG: "{{ .Values.singleURSimControl.debug }}"
+  placement:
+    clusters:
+    - name: cloud
+    - name: edge-1
+    - name: edge-2

templates/redis_deployment.yaml

@@ -1,31 +1,48 @@
 ---
-apiVersion: apps/v1
-kind: Deployment
+apiVersion: types.kubefed.io/v1beta1
+kind: FederatedDeployment
 metadata:
   name: controller-redis
 spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: controller-redis
   template:
     metadata:
       labels:
         app: controller-redis
     spec:
-      containers:
-        - name: controller-redis
-          image: redis
+      replicas: 1
+      selector:
+        matchLabels:
+          app: controller-redis
+      template:
+        metadata:
+          labels:
+            app: controller-redis
+        spec:
+          containers:
+            - name: controller-redis
+              image: redis
+  placement:
+    clusters:
+    - name: cloud
+    - name: edge-1
+    - name: edge-2
 ---
-apiVersion: v1
-kind: Service
+apiVersion: types.kubefed.io/v1beta1
+kind: FederatedService
 metadata:
   name: controller-redis
 spec:
-  selector:
-    app: controller-redis
-  ports:
-    - name: controller-redis
-      protocol: TCP
-      port: 6379
-      targetPort: 6379
+  template:
+    spec:
+      selector:
+        app: controller-redis
+      ports:
+        - name: controller-redis
+          protocol: TCP
+          port: 6379
+          targetPort: 6379
+  placement:
+    clusters:
+    - name: cloud
+    - name: edge-1
+    - name: edge-2

templates/serivceaccount.yaml

@@ -4,8 +4,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: job-orchestrator-role
 rules:
- - apiGroups: [""]
-   resources: ["pods"]
+ - apiGroups: ["types.kubefed.io"]
+   resources: ["federatedjobs"]
    verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
 ---
 kind: RoleBinding

values.yaml

@@ -3,6 +3,7 @@ k8s:
   regcred_name: regcred
 jobOrchestrator:
   sentry_dsn: ""
+  link_quality_report_url: "http://192.168.110.100:30420/report/link"
 programService:
   sentry_dsn: ""
 singleURSimControl: