diff --git a/Cargo.lock b/Cargo.lock index 824f2702c..95ac6247e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -320,7 +320,7 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "agent" -version = "0.4.2" +version = "0.4.3" dependencies = [ "akri-debug-echo", "akri-discovery-utils", @@ -385,7 +385,7 @@ dependencies = [ [[package]] name = "akri-debug-echo" -version = "0.4.2" +version = "0.4.3" dependencies = [ "akri-discovery-utils", "akri-shared", @@ -404,7 +404,7 @@ dependencies = [ [[package]] name = "akri-discovery-utils" -version = "0.4.2" +version = "0.4.3" dependencies = [ "akri-shared", "anyhow", @@ -424,7 +424,7 @@ dependencies = [ [[package]] name = "akri-onvif" -version = "0.4.2" +version = "0.4.3" dependencies = [ "akri-discovery-utils", "akri-shared", @@ -452,7 +452,7 @@ dependencies = [ [[package]] name = "akri-opcua" -version = "0.4.2" +version = "0.4.3" dependencies = [ "akri-discovery-utils", "akri-shared", @@ -475,7 +475,7 @@ dependencies = [ [[package]] name = "akri-shared" -version = "0.4.2" +version = "0.4.3" dependencies = [ "anyhow", "async-trait", @@ -504,7 +504,7 @@ dependencies = [ [[package]] name = "akri-udev" -version = "0.4.2" +version = "0.4.3" dependencies = [ "akri-discovery-utils", "anyhow", @@ -1059,7 +1059,7 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "controller" -version = "0.4.2" +version = "0.4.3" dependencies = [ "akri-shared", "anyhow", @@ -1220,7 +1220,7 @@ dependencies = [ [[package]] name = "debug-echo-discovery-handler" -version = "0.4.2" +version = "0.4.3" dependencies = [ "akri-debug-echo", "akri-discovery-utils", @@ -2410,7 +2410,7 @@ checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" [[package]] name = "onvif-discovery-handler" -version = "0.4.2" +version = "0.4.3" dependencies = [ "akri-discovery-utils", "akri-onvif", @@ -2476,7 +2476,7 @@ dependencies = [ [[package]] name = "opcua-discovery-handler" -version = "0.4.2" +version = "0.4.3" dependencies = [ "akri-discovery-utils", "akri-opcua", @@ -4551,7 +4551,7 @@ dependencies = [ [[package]] name = "udev-discovery-handler" -version = "0.4.2" +version = "0.4.3" dependencies = [ "akri-discovery-utils", "akri-udev", @@ -4562,7 +4562,7 @@ dependencies = [ [[package]] name = "udev-video-broker" -version = "0.4.2" +version = "0.4.3" dependencies = [ "akri-shared", "env_logger", @@ -4856,7 +4856,7 @@ dependencies = [ [[package]] name = "webhook-configuration" -version = "0.4.2" +version = "0.4.3" dependencies = [ "actix", "actix-rt", diff --git a/agent/Cargo.toml b/agent/Cargo.toml index db4d98d0e..335e1a568 100644 --- a/agent/Cargo.toml +++ b/agent/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "agent" -version = "0.4.2" +version = "0.4.3" authors = ["Kate Goldenring ", ""] edition = "2018" diff --git a/controller/Cargo.toml b/controller/Cargo.toml index 66f0cbeed..1722a95c2 100644 --- a/controller/Cargo.toml +++ b/controller/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "controller" -version = "0.4.2" +version = "0.4.3" authors = [""] edition = "2018" diff --git a/deployment/helm/Chart.yaml b/deployment/helm/Chart.yaml index 56e6665b4..748b92494 100644 --- 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.4.2 +version: 0.4.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. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 0.4.2 +appVersion: 0.4.3 diff --git a/deployment/helm/templates/agent.yaml b/deployment/helm/templates/agent.yaml index 9ea1c8348..43349c93c 100644 --- a/deployment/helm/templates/agent.yaml +++ b/deployment/helm/templates/agent.yaml @@ -29,13 +29,13 @@ spec: {{- $repository := ternary .Values.agent.image.fullRepository .Values.agent.image.repository .Values.agent.full -}} {{- if .Values.useDevelopmentContainers }} {{- if .Values.useLatestContainers }} - image: {{ printf "%s:latest-dev" $repository | quote }} + image: {{ printf "%s:%s" $repository (default "latest-dev" .Values.agent.image.tag) | quote }} {{- else }} image: {{ printf "%s:%s" $repository (default (printf "v%s-dev" .Chart.AppVersion) .Values.agent.image.tag) | quote }} {{- end }} {{- else }} {{- if .Values.useLatestContainers }} - image: {{ printf "%s:latest" $repository | quote }} + image: {{ printf "%s:%s" $repository (default "latest" .Values.agent.image.tag) | quote }} {{- else }} image: {{ printf "%s:%s" $repository (default (printf "v%s" .Chart.AppVersion) .Values.agent.image.tag) | quote }} {{- end }} diff --git a/deployment/helm/templates/controller.yaml b/deployment/helm/templates/controller.yaml index 2c661c8fa..d471e20c9 100644 --- a/deployment/helm/templates/controller.yaml +++ b/deployment/helm/templates/controller.yaml @@ -20,13 +20,13 @@ spec: - name: akri-controller {{- if .Values.useDevelopmentContainers }} {{- if .Values.useLatestContainers }} - image: {{ printf "%s:latest-dev" .Values.controller.image.repository | quote }} + image: {{ printf "%s:%s" .Values.controller.image.repository (default "latest-dev" .Values.controller.image.tag) | quote }} {{- else }} image: {{ printf "%s:%s" .Values.controller.image.repository (default (printf "v%s-dev" .Chart.AppVersion) .Values.controller.image.tag) | quote }} {{- end }} {{- else }} {{- if .Values.useLatestContainers }} - image: {{ printf "%s:latest" .Values.controller.image.repository | quote }} + image: {{ printf "%s:%s" .Values.controller.image.repository (default "latest" .Values.controller.image.tag) | quote }} {{- else }} image: {{ printf "%s:%s" .Values.controller.image.repository (default (printf "v%s" .Chart.AppVersion) .Values.controller.image.tag) | quote }} {{- end }} diff --git a/deployment/helm/templates/debug-echo-discovery-handler.yaml b/deployment/helm/templates/debug-echo-discovery-handler.yaml index de4c2d22f..512597562 100644 --- a/deployment/helm/templates/debug-echo-discovery-handler.yaml +++ b/deployment/helm/templates/debug-echo-discovery-handler.yaml @@ -16,13 +16,13 @@ spec: - name: akri-debug-echo-discovery {{- if .Values.useDevelopmentContainers }} {{- if .Values.useLatestContainers }} - image: {{ printf "%s:latest-dev" .Values.debugEcho.discovery.image.repository | quote }} + image: {{ printf "%s:%s" .Values.debugEcho.discovery.image.repository (default "latest-dev" .Values.debugEcho.discovery.image.tag) | quote }} {{- else }} image: {{ printf "%s:%s" .Values.debugEcho.discovery.image.repository (default (printf "v%s-dev" .Chart.AppVersion) .Values.debugEcho.discovery.image.tag) | quote }} {{- end }} {{- else }} {{- if .Values.useLatestContainers }} - image: {{ printf "%s:latest" .Values.debugEcho.discovery.image.repository | quote }} + image: {{ printf "%s:%s" .Values.debugEcho.discovery.image.repository (default "latest" .Values.debugEcho.discovery.image.tag) | quote }} {{- else }} image: {{ printf "%s:%s" .Values.debugEcho.discovery.image.repository (default (printf "v%s" .Chart.AppVersion) .Values.debugEcho.discovery.image.tag) | quote }} {{- end }} diff --git a/deployment/helm/templates/onvif-discovery-handler.yaml b/deployment/helm/templates/onvif-discovery-handler.yaml index 3d8108bdc..327cdaeff 100644 --- a/deployment/helm/templates/onvif-discovery-handler.yaml +++ b/deployment/helm/templates/onvif-discovery-handler.yaml @@ -18,13 +18,13 @@ spec: - name: akri-onvif-discovery {{- if .Values.useDevelopmentContainers }} {{- if .Values.useLatestContainers }} - image: {{ printf "%s:latest-dev" .Values.onvif.discovery.image.repository | quote }} + image: {{ printf "%s:%s" .Values.onvif.discovery.image.repository (default "latest-dev" .Values.onvif.discovery.image.tag) | quote }} {{- else }} image: {{ printf "%s:%s" .Values.onvif.discovery.image.repository (default (printf "v%s-dev" .Chart.AppVersion) .Values.onvif.discovery.image.tag) | quote }} {{- end }} {{- else }} {{- if .Values.useLatestContainers }} - image: {{ printf "%s:latest" .Values.onvif.discovery.image.repository | quote }} + image: {{ printf "%s:%s" .Values.onvif.discovery.image.repository (default "latest" .Values.onvif.discovery.image.tag) | quote }} {{- else }} image: {{ printf "%s:%s" .Values.onvif.discovery.image.repository (default (printf "v%s" .Chart.AppVersion) .Values.onvif.discovery.image.tag) | quote }} {{- end }} diff --git a/deployment/helm/templates/opcua-discovery-handler.yaml b/deployment/helm/templates/opcua-discovery-handler.yaml index 05b803d1a..5eb520040 100644 --- a/deployment/helm/templates/opcua-discovery-handler.yaml +++ b/deployment/helm/templates/opcua-discovery-handler.yaml @@ -16,13 +16,13 @@ spec: - name: akri-opcua-discovery {{- if .Values.useDevelopmentContainers }} {{- if .Values.useLatestContainers }} - image: {{ printf "%s:latest-dev" .Values.opcua.discovery.image.repository | quote }} + image: {{ printf "%s:%s" .Values.opcua.discovery.image.repository (default "latest-dev" .Values.opcua.discovery.image.tag) | quote }} {{- else }} image: {{ printf "%s:%s" .Values.opcua.discovery.image.repository (default (printf "v%s-dev" .Chart.AppVersion) .Values.opcua.discovery.image.tag) | quote }} {{- end }} {{- else }} {{- if .Values.useLatestContainers }} - image: {{ printf "%s:latest" .Values.opcua.discovery.image.repository | quote }} + image: {{ printf "%s:%s" .Values.opcua.discovery.image.repository (default "latest" .Values.opcua.discovery.image.tag) | quote }} {{- else }} image: {{ printf "%s:%s" .Values.opcua.discovery.image.repository (default (printf "v%s" .Chart.AppVersion) .Values.opcua.discovery.image.tag) | quote }} {{- end }} diff --git a/deployment/helm/templates/udev-discovery-handler.yaml b/deployment/helm/templates/udev-discovery-handler.yaml index 436448d08..73063c3b5 100644 --- a/deployment/helm/templates/udev-discovery-handler.yaml +++ b/deployment/helm/templates/udev-discovery-handler.yaml @@ -18,13 +18,13 @@ spec: - name: akri-udev-discovery {{- if .Values.useDevelopmentContainers }} {{- if .Values.useLatestContainers }} - image: {{ printf "%s:latest-dev" .Values.udev.discovery.image.repository | quote }} + image: {{ printf "%s:%s" .Values.udev.discovery.image.repository (default "latest-dev" .Values.udev.discovery.image.tag) | quote }} {{- else }} image: {{ printf "%s:%s" .Values.udev.discovery.image.repository (default (printf "v%s-dev" .Chart.AppVersion) .Values.udev.discovery.image.tag) | quote }} {{- end }} {{- else }} {{- if .Values.useLatestContainers }} - image: {{ printf "%s:latest" .Values.udev.discovery.image.repository | quote }} + image: {{ printf "%s:%s" .Values.udev.discovery.image.repository (default "latest" .Values.udev.discovery.image.tag) | quote }} {{- else }} image: {{ printf "%s:%s" .Values.udev.discovery.image.repository (default (printf "v%s" .Chart.AppVersion) .Values.udev.discovery.image.tag) | quote }} {{- end }} diff --git a/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml b/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml index cf87239d9..bf3c876ed 100644 --- 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.4.2" +version = "0.4.3" authors = ["Kate Goldenring "] edition = "2018" diff --git a/discovery-handler-modules/onvif-discovery-handler/Cargo.toml b/discovery-handler-modules/onvif-discovery-handler/Cargo.toml index 8cddee6eb..325e3e0b5 100644 --- 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.4.2" +version = "0.4.3" authors = ["Kate Goldenring "] edition = "2018" diff --git a/discovery-handler-modules/opcua-discovery-handler/Cargo.toml b/discovery-handler-modules/opcua-discovery-handler/Cargo.toml index 3a48b5fc6..02a67e655 100644 --- 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.4.2" +version = "0.4.3" authors = ["Kate Goldenring "] edition = "2018" diff --git a/discovery-handler-modules/udev-discovery-handler/Cargo.toml b/discovery-handler-modules/udev-discovery-handler/Cargo.toml index 304e9da27..d7c5fe964 100644 --- 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.4.2" +version = "0.4.3" authors = ["Kate Goldenring "] edition = "2018" diff --git a/discovery-handlers/debug-echo/Cargo.toml b/discovery-handlers/debug-echo/Cargo.toml index f92006a98..e8d402f65 100644 --- 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.4.2" +version = "0.4.3" authors = ["Kate Goldenring "] edition = "2018" diff --git a/discovery-handlers/onvif/Cargo.toml b/discovery-handlers/onvif/Cargo.toml index da5005764..3044f246b 100644 --- a/discovery-handlers/onvif/Cargo.toml +++ b/discovery-handlers/onvif/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-onvif" -version = "0.4.2" +version = "0.4.3" authors = ["Kate Goldenring "] edition = "2018" diff --git a/discovery-handlers/opcua/Cargo.toml b/discovery-handlers/opcua/Cargo.toml index 698cb7720..3b4e2c7b5 100644 --- a/discovery-handlers/opcua/Cargo.toml +++ b/discovery-handlers/opcua/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-opcua" -version = "0.4.2" +version = "0.4.3" authors = ["Kate Goldenring "] edition = "2018" diff --git a/discovery-handlers/udev/Cargo.toml b/discovery-handlers/udev/Cargo.toml index c6f183daf..e0298695a 100644 --- a/discovery-handlers/udev/Cargo.toml +++ b/discovery-handlers/udev/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-udev" -version = "0.4.2" +version = "0.4.3" authors = ["Kate Goldenring "] edition = "2018" diff --git a/discovery-utils/Cargo.toml b/discovery-utils/Cargo.toml index c289cd097..52ee5eec1 100644 --- a/discovery-utils/Cargo.toml +++ b/discovery-utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-discovery-utils" -version = "0.4.2" +version = "0.4.3" authors = ["Kate Goldenring "] edition = "2018" diff --git a/samples/brokers/udev-video-broker/Cargo.toml b/samples/brokers/udev-video-broker/Cargo.toml index c81586663..1b1d5a8ca 100644 --- 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.4.2" +version = "0.4.3" authors = ["Kate Goldenring ", ""] edition = "2018" diff --git a/shared/Cargo.toml b/shared/Cargo.toml index a28e89f6a..5ba9d36d2 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-shared" -version = "0.4.2" +version = "0.4.3" authors = [""] edition = "2018" diff --git a/version.txt b/version.txt index 2b7c5ae01..17b2ccd9b 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.4.2 +0.4.3 diff --git a/webhooks/validating/configuration/Cargo.toml b/webhooks/validating/configuration/Cargo.toml index 02989df2f..c5959a36f 100644 --- a/webhooks/validating/configuration/Cargo.toml +++ b/webhooks/validating/configuration/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "webhook-configuration" -version = "0.4.2" +version = "0.4.3" authors = ["DazWilkin "] edition = "2018"