Enable specifying ImagePullSecrets for Job brokers (#441)

project-akri · Jan 19, 2022 · ad45736 · ad45736
1 parent efffe84
commit ad45736
Show file tree

Hide file tree

Showing 25 changed files with 121 additions and 37 deletions.
diff --git a/.github/workflows/run-helm.yml b/.github/workflows/run-helm.yml
@@ -34,7 +34,9 @@ jobs:
       - uses: azure/setup-helm@v1
 
       - name: Lint helm chart
-        run: helm lint deployment/helm --values test/helm-lint-values.yaml && echo "lint finished successfully" || echo ::warning::"lint found issues"
+        run: |
+          helm lint deployment/helm --values test/helm-lint-values.yaml && echo "lint finished successfully" || echo ::warning::"lint found issues"
+          helm lint deployment/helm --values test/helm-lint-values-jobs.yaml && echo "lint with Job brokers finished successfully" || echo ::warning::"lint with Job brokers found issues"
 
 
   helm:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/agent/Cargo.toml b/agent/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "agent"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>", "<bfjelds@microsoft.com>"]
 edition = "2018"
 

diff --git a/controller/Cargo.toml b/controller/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "controller"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["<bfjelds@microsoft.com>", "<kagold@microsoft.com>"]
 edition = "2018"
 

diff --git a/deployment/helm/Chart.yaml b/deployment/helm/Chart.yaml
@@ -15,9 +15,9 @@ 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.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.8.0
+version: 0.8.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 0.8.0
+appVersion: 0.8.1
diff --git a/deployment/helm/templates/custom-configuration.yaml b/deployment/helm/templates/custom-configuration.yaml
@@ -57,7 +57,7 @@ spec:
           restartPolicy: {{ .Values.custom.configuration.brokerJob.restartPolicy }}
           {{- with .Values.imagePullSecrets }}
           imagePullSecrets:
-            {{- toYaml . | nindent 6 }}
+            {{- toYaml . | nindent 10 }}
           {{- end }}
       backoffLimit: {{ .Values.custom.configuration.brokerJob.backoffLimit }}
       parallelism: {{ .Values.custom.configuration.brokerJob.parallelism }}

diff --git a/deployment/helm/templates/debug-echo-configuration.yaml b/deployment/helm/templates/debug-echo-configuration.yaml
@@ -63,7 +63,7 @@ spec:
           restartPolicy: {{ .Values.debugEcho.configuration.brokerJob.restartPolicy }}
           {{- with .Values.imagePullSecrets }}
           imagePullSecrets:
-            {{- toYaml . | nindent 6 }}
+            {{- toYaml . | nindent 10 }}
           {{- end }}
       backoffLimit: {{ .Values.debugEcho.configuration.brokerJob.backoffLimit }}
       parallelism: {{ .Values.debugEcho.configuration.brokerJob.parallelism }}

diff --git a/deployment/helm/templates/onvif-configuration.yaml b/deployment/helm/templates/onvif-configuration.yaml
@@ -89,7 +89,7 @@ spec:
           restartPolicy: {{ .Values.onvif.configuration.brokerJob.restartPolicy }}
           {{- with .Values.imagePullSecrets }}
           imagePullSecrets:
-            {{- toYaml . | nindent 6 }}
+            {{- toYaml . | nindent 10 }}
           {{- end }}
       backoffLimit: {{ .Values.onvif.configuration.brokerJob.backoffLimit }}
       parallelism: {{ .Values.onvif.configuration.brokerJob.parallelism }}

diff --git a/deployment/helm/templates/opcua-configuration.yaml b/deployment/helm/templates/opcua-configuration.yaml
@@ -98,7 +98,7 @@ spec:
           restartPolicy: {{ .Values.opcua.configuration.brokerJob.restartPolicy }}
           {{- with .Values.imagePullSecrets }}
           imagePullSecrets:
-            {{- toYaml . | nindent 6 }}
+            {{- toYaml . | nindent 10 }}
           {{- end }}
       backoffLimit: {{ .Values.opcua.configuration.brokerJob.backoffLimit }}
       parallelism: {{ .Values.opcua.configuration.brokerJob.parallelism }}

diff --git a/deployment/helm/templates/udev-configuration.yaml b/deployment/helm/templates/udev-configuration.yaml
@@ -72,7 +72,7 @@ spec:
           restartPolicy: {{ .Values.udev.configuration.brokerJob.restartPolicy }}
           {{- with .Values.imagePullSecrets }}
           imagePullSecrets:
-            {{- toYaml . | nindent 6 }}
+            {{- toYaml . | nindent 10 }}
           {{- end }}
       backoffLimit: {{ .Values.udev.configuration.brokerJob.backoffLimit }}
       parallelism: {{ .Values.udev.configuration.brokerJob.parallelism }}

diff --git a/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml b/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "debug-echo-discovery-handler"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
 

diff --git a/discovery-handler-modules/onvif-discovery-handler/Cargo.toml b/discovery-handler-modules/onvif-discovery-handler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "onvif-discovery-handler"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
 

diff --git a/discovery-handler-modules/opcua-discovery-handler/Cargo.toml b/discovery-handler-modules/opcua-discovery-handler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "opcua-discovery-handler"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
 

diff --git a/discovery-handler-modules/udev-discovery-handler/Cargo.toml b/discovery-handler-modules/udev-discovery-handler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "udev-discovery-handler"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
 

diff --git a/discovery-handlers/debug-echo/Cargo.toml b/discovery-handlers/debug-echo/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-debug-echo"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
 

diff --git a/discovery-handlers/onvif/Cargo.toml b/discovery-handlers/onvif/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-onvif"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
 

diff --git a/discovery-handlers/opcua/Cargo.toml b/discovery-handlers/opcua/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-opcua"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
 

diff --git a/discovery-handlers/udev/Cargo.toml b/discovery-handlers/udev/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-udev"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
 

diff --git a/discovery-utils/Cargo.toml b/discovery-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-discovery-utils"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
 

diff --git a/samples/brokers/udev-video-broker/Cargo.toml b/samples/brokers/udev-video-broker/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "udev-video-broker"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>", "<bfjelds@microsoft.com>"]
 edition = "2018"
 

diff --git a/shared/Cargo.toml b/shared/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-shared"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["<bfjelds@microsoft.com>"]
 edition = "2018"
 

diff --git a/test/helm-lint-values-jobs.yaml b/test/helm-lint-values-jobs.yaml
@@ -0,0 +1,80 @@
+# This document provides values to be passed to `helm lint` to provide more exhaustive linting in our workflows for scenarios with Job brokers.
+# Can also be used locally from base of Akri repository: `helm lint deployment/helm --values test/helm-lint-values-jobs.yaml`
+# Alternatively, linting can be done in line by setting values: 
+# `helm lint deployment/helm/ --set debugEcho.configuration.enabled=true,udev.configuration.enabled=true,udev.configuration.discoveryDetails.udevRules[0]='KERNEL=="video[0-9]*"'...`
+debugEcho:
+  configuration:
+    enabled: true
+    brokerJob:
+      image:
+        repository: "busybox"
+      backoffLimit: 4
+      parallelism: 2
+      completions: 2
+      restartPolicy: Never
+      command: 
+      - "sh"
+      - "c"
+      - "ls"
+udev:
+  configuration:
+    enabled: true
+    discoveryDetails:
+      udevRules:
+        - 'KERNEL=="video[0-9]*"'
+    brokerJob:
+      image:
+        repository: "busybox"
+      backoffLimit: 4
+      parallelism: 2
+      completions: 2
+      restartPolicy: Never
+      command: 
+      - "sh"
+      - "c"
+      - "ls"
+opcua: 
+  configuration:
+    enabled: true
+    brokerJob:
+      image:
+        repository: "busybox"
+      backoffLimit: 4
+      parallelism: 2
+      completions: 2
+      restartPolicy: Never
+      command: 
+      - "sh"
+      - "c"
+      - "ls"
+onvif: 
+  configuration: 
+    enabled: true
+    brokerJob:
+      image:
+        repository: "busybox"
+      backoffLimit: 4
+      parallelism: 2
+      completions: 2
+      restartPolicy: Never
+      command: 
+      - "sh"
+      - "c"
+      - "ls"
+custom: 
+  configuration: 
+    enabled: true
+    discoveryHandlerName: "some name"
+    brokerJob:
+      image:
+        repository: "busybox"
+      backoffLimit: 4
+      parallelism: 2
+      completions: 2
+      restartPolicy: Never
+      command: 
+      - "sh"
+      - "c"
+      - "ls"
+imagePullSecrets:
+- name: "my-image-registry-creds"
diff --git a/test/helm-lint-values.yaml b/test/helm-lint-values.yaml
@@ -54,3 +54,5 @@ custom:
 webhookConfiguration: 
   enabled: true
   caBundle: certificate.crt
+imagePullSecrets:
+- name: "my-image-registry-creds"
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-0.8.0
+0.8.1
diff --git a/webhooks/validating/configuration/Cargo.toml b/webhooks/validating/configuration/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "webhook-configuration"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["DazWilkin <daz.wilkin@gmail.com>"]
 edition = "2018"