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.6
+version: 0.1.3
 
 # 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.1
+appVersion: 0.1.0

templates/job_orchestrator_deployment.yaml

@@ -47,21 +47,13 @@ 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: types.kubefed.io/v1beta1
+apiVersion: v1
-kind: FederatedConfigMap
+kind: ConfigMap
 metadata:
   name: single-ursim-controller-config
-spec:
+data:
-  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,14 +1,9 @@
 ---
-apiVersion: types.kubefed.io/v1beta1
+apiVersion: apps/v1
-kind: FederatedDeployment
+kind: Deployment
 metadata:
   name: controller-redis
 spec:
-  template:
-    metadata:
-      labels:
-        app: controller-redis
-    spec:
   replicas: 1
   selector:
     matchLabels:
@@ -21,19 +16,12 @@ spec:
       containers:
         - name: controller-redis
           image: redis
-  placement:
-    clusters:
-    - name: cloud
-    - name: edge-1
-    - name: edge-2
 ---
-apiVersion: types.kubefed.io/v1beta1
+apiVersion: v1
-kind: FederatedService
+kind: Service
 metadata:
   name: controller-redis
 spec:
-  template:
-    spec:
   selector:
     app: controller-redis
   ports:
@@ -41,8 +29,3 @@ spec:
       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: ["types.kubefed.io"]
+ - apiGroups: [""]
-   resources: ["federatedjobs"]
+   resources: ["pods"]
    verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
 ---
 kind: RoleBinding

values.yaml

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