Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Image pull policy #207

Merged
merged 4 commits into from
Jan 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion agent/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "agent"
version = "0.1.12"
version = "0.1.13"
authors = ["Kate Goldenring <[email protected]>", "<[email protected]>"]
edition = "2018"

Expand Down
2 changes: 1 addition & 1 deletion controller/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "controller"
version = "0.1.12"
version = "0.1.13"
authors = ["<[email protected]>"]
edition = "2018"

Expand Down
4 changes: 2 additions & 2 deletions deployment/helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.1.12
version: 0.1.13

# 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.1.12
appVersion: 0.1.13
4 changes: 3 additions & 1 deletion deployment/helm/templates/agent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ spec:
image: {{ printf "%s:%s" .Values.agent.image.repository (default (printf "v%s" .Chart.AppVersion) .Values.agent.image.tag) | quote }}
{{- end }}
{{- end }}
imagePullPolicy: {{ .Values.agent.image.pullPolicy }}
{{- with .Values.agent.image.pullPolicy }}
imagePullPolicy: {{ . }}
{{- end }}
{{- if .Values.agent.securityContext }}
securityContext:
{{- toYaml .Values.agent.securityContext | nindent 10 }}
Expand Down
4 changes: 3 additions & 1 deletion deployment/helm/templates/controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ spec:
image: {{ printf "%s:%s" .Values.controller.image.repository (default (printf "v%s" .Chart.AppVersion) .Values.controller.image.tag) | quote }}
{{- end }}
{{- end }}
imagePullPolicy: {{ .Values.controller.image.pullPolicy }}
{{- with .Values.controller.image.pullPolicy }}
imagePullPolicy: {{ . }}
{{- end }}
{{- if .Values.prometheus.enabled }}
ports:
- name: {{ .Values.prometheus.portName | quote }}
Expand Down
4 changes: 3 additions & 1 deletion deployment/helm/templates/debug-echo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ spec:
containers:
- name: {{ .Values.debugEcho.name }}-broker
image: {{ .Values.debugEcho.brokerPod.image | quote }}
imagePullPolicy: {{ .Values.debugEcho.pullPolicy }}
{{- with .Values.debugEcho.pullPolicy }}
imagePullPolicy: {{ . }}
{{- end }}
resources:
limits:
{{`"{{PLACEHOLDER}}"`}} : "1"
Expand Down
4 changes: 3 additions & 1 deletion deployment/helm/templates/onvif.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ spec:
containers:
- name: {{ .Values.onvif.name }}-broker
image: {{ .Values.onvif.brokerPod.image.repository | quote }}
imagePullPolicy: {{ .Values.onvif.brokerPod.image.pullPolicy }}
{{- with .Values.onvif.brokerPod.image.pullPolicy }}
imagePullPolicy: {{ . }}
{{- end }}
{{- if .Values.onvif.brokerPod.env }}
env:
{{- range $key, $val := .Values.onvif.brokerPod.env }}
Expand Down
4 changes: 3 additions & 1 deletion deployment/helm/templates/opcua.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ spec:
containers:
- name: {{ .Values.opcua.name }}-broker
image: {{ .Values.opcua.brokerPod.image.repository | quote }}
imagePullPolicy: {{ .Values.opcua.brokerPod.image.pullPolicy }}
{{- with .Values.opcua.brokerPod.image.pullPolicy }}
imagePullPolicy: {{ . }}
{{- end }}
{{- if .Values.opcua.brokerPod.env }}
env:
{{- range $key, $val := .Values.opcua.brokerPod.env }}
Expand Down
4 changes: 3 additions & 1 deletion deployment/helm/templates/udev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ spec:
containers:
- name: {{ .Values.udev.name }}-broker
image: {{ .Values.udev.brokerPod.image.repository | quote }}
imagePullPolicy: {{ .Values.udev.brokerPod.image.pullPolicy }}
{{- with .Values.udev.brokerPod.image.pullPolicy }}
imagePullPolicy: {{ . }}
{{- end }}
{{- if .Values.udev.brokerPod.env }}
env:
{{- range $key, $val := .Values.udev.brokerPod.env }}
Expand Down
12 changes: 6 additions & 6 deletions deployment/helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ controller:
# controller.yaml will default to v(AppVersion)-dev
tag:
# pullPolicy is the Akri Controller pull policy
pullPolicy: Always
pullPolicy: ""
# onlyOnControlPlane dictates whether the Akri Controller will only run on nodes with
# the label with (key, value) of ("node-role.kubernetes.io/master", "")
onlyOnControlPlane: false
Expand All @@ -69,7 +69,7 @@ agent:
# agent.yaml will default to v(AppVersion)-dev
tag:
# pullPolicy is the Akri Agent pull policy
pullPolicy: Always
pullPolicy: ""
securityContext: {}
host:
# kubeletDevicePlugins is the location of the kubelet device-plugin sockets
Expand Down Expand Up @@ -109,7 +109,7 @@ debugEcho:
# container used by debugEcho
image: nginx:latest
# pullPolicy is the debugEcho pull policy
pullPolicy: Always
pullPolicy: ""
bfjelds marked this conversation as resolved.
Show resolved Hide resolved
instanceService:
# name is the description of the instance service
name: akri-debug-echo-foo-instance-service
Expand Down Expand Up @@ -160,7 +160,7 @@ onvif:
# repository is the container reference
repository:
# pullPolicy is the Akri onvif broker pull policy
pullPolicy: Always
pullPolicy: ""
# createInstanceServices is specified if a service should automatically be
# created for each broker pod
createInstanceServices: true
Expand Down Expand Up @@ -225,7 +225,7 @@ opcua:
# repository is the Akri OPC UA broker container reference
repository:
# pullPolicy is the Akri OPC UA broker pull policy
pullPolicy: Always
pullPolicy: ""
# createInstanceServices is specified if a service should automatically be
# created for each broker pod
createInstanceServices: true
Expand Down Expand Up @@ -274,7 +274,7 @@ udev:
image:
# repository is the container reference
repository:
pullPolicy: Always
pullPolicy: ""
securityContext: {}
# createInstanceServices is specified if a service should automatically be
# created for each broker pod
Expand Down
2 changes: 0 additions & 2 deletions docs/customizing-akri-installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ spec:
containers:
- name: akri-onvif-video-broker
image: "ghcr.io/deislabs/akri/onvif-video-broker:latest-dev"
imagePullPolicy: Always
resources:
limits:
"{{PLACEHOLDER}}" : "1"
Expand All @@ -114,7 +113,6 @@ spec:
containers:
- name: akri-onvif-video-broker
image: "ghcr.io/deislabs/akri/onvif-video-broker:latest-dev"
imagePullPolicy: Always
resources:
requests:
memory: 30Mi
Expand Down
1 change: 0 additions & 1 deletion docs/proposals/broker-deployment-strategies.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ spec:
containers:
- name: akri-onvif-video-broker
image: "ghcr.io/..."
imagePullPolicy: Always
resources:
limits:
"{{PLACEHOLDER}}" : "1"
Expand Down
2 changes: 1 addition & 1 deletion samples/brokers/udev-video-broker/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "udev-video-broker"
version = "0.1.12"
version = "0.1.13"
authors = ["Kate Goldenring <[email protected]>", "<[email protected]>"]
edition = "2018"

Expand Down
2 changes: 1 addition & 1 deletion shared/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "akri-shared"
version = "0.1.12"
version = "0.1.13"
authors = ["<[email protected]>"]
edition = "2018"

Expand Down
1 change: 0 additions & 1 deletion test/yaml/akri-onvif-video.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ spec:
containers:
- name: akri-onvif-video-broker
image: "ghcr.io/deislabs/akri/onvif-video-broker:latest-dev"
imagePullPolicy: Always
resources:
limits:
"{{PLACEHOLDER}}" : "1"
Expand Down
1 change: 0 additions & 1 deletion test/yaml/akri-opcua.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ spec:
containers:
- name: akri-opcua-broker
image: "ghcr.io/deislabs/akri/opcua-monitoring-broker:latest-dev"
imagePullPolicy: Always
env:
- name: IDENTIFIER
value:
Expand Down
1 change: 0 additions & 1 deletion test/yaml/akri-udev-video.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ spec:
containers:
- name: akri-udev-video-broker
image: "ghcr.io/deislabs/akri/udev-video-broker:latest-dev"
imagePullPolicy: Always
env:
- name: FORMAT # default: MJPG
value: "YUYV"
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.12
0.1.13