From cda26804774a4a9161c5fb0fdaded9dfd1ed35fb Mon Sep 17 00:00:00 2001 From: Corneil du Plessis Date: Thu, 19 Oct 2023 14:58:31 +0200 Subject: [PATCH] Update imagePullPolicy to be IfNotPresent by default. --- .../asciidoc/configuration-kubernetes-app-properties.adoc | 4 ++-- .../src/main/asciidoc/configuration-kubernetes.adoc | 8 ++++---- .../application-kubernetes-platform-properties.yml | 2 +- .../test/resources/application-platform-properties.yml | 2 +- src/carvel/config/dataflow-deployment.yml | 2 +- src/carvel/config/skipper-deployment.yml | 2 +- src/kubernetes/server/server-deployment.yaml | 2 +- src/kubernetes/skipper/skipper-deployment.yaml | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/spring-cloud-dataflow-docs/src/main/asciidoc/configuration-kubernetes-app-properties.adoc b/spring-cloud-dataflow-docs/src/main/asciidoc/configuration-kubernetes-app-properties.adoc index e4d626e235..68d702244a 100644 --- a/spring-cloud-dataflow-docs/src/main/asciidoc/configuration-kubernetes-app-properties.adoc +++ b/spring-cloud-dataflow-docs/src/main/asciidoc/configuration-kubernetes-app-properties.adoc @@ -504,7 +504,7 @@ The following example shows how you can individually configure applications: ==== [source,options=nowrap] ---- -deployer..kubernetes.imagePullPolicy=Always +deployer..kubernetes.imagePullPolicy=IfNotPresent ---- ==== @@ -527,7 +527,7 @@ data: kubernetes: accounts: default: - imagePullPolicy: Always + imagePullPolicy: IfNotPresent ---- ==== diff --git a/spring-cloud-dataflow-docs/src/main/asciidoc/configuration-kubernetes.adoc b/spring-cloud-dataflow-docs/src/main/asciidoc/configuration-kubernetes.adoc index e1b382de06..5ed8833480 100644 --- a/spring-cloud-dataflow-docs/src/main/asciidoc/configuration-kubernetes.adoc +++ b/spring-cloud-dataflow-docs/src/main/asciidoc/configuration-kubernetes.adoc @@ -429,7 +429,7 @@ spring: accounts: dev: namespace: devNamespace - imagePullPolicy: Always + imagePullPolicy: IfNotPresent entryPointStyle: exec limits: cpu: 4 @@ -556,8 +556,8 @@ The following YAML snippet from a Deployment is an example of mounting a ConfigM ... containers: - name: scdf-server - image: springcloud/spring-cloud-dataflow-server:2.5.0.BUILD-SNAPSHOT - imagePullPolicy: Always + image: springcloud/spring-cloud-dataflow-server:2.11.1-SNAPSHOT + imagePullPolicy: IfNotPresent volumeMounts: - name: config mountPath: /config @@ -897,7 +897,7 @@ The following example shows how you can individually configure containers: [source,options=nowrap] ---- -deployer.kubernetes.imagePullPolicy=Always +deployer.kubernetes.imagePullPolicy=IfNotPresent ---- diff --git a/spring-cloud-dataflow-platform-kubernetes/src/test/resources/application-kubernetes-platform-properties.yml b/spring-cloud-dataflow-platform-kubernetes/src/test/resources/application-kubernetes-platform-properties.yml index ea3fc7b20f..aee63264fa 100644 --- a/spring-cloud-dataflow-platform-kubernetes/src/test/resources/application-kubernetes-platform-properties.yml +++ b/spring-cloud-dataflow-platform-kubernetes/src/test/resources/application-kubernetes-platform-properties.yml @@ -9,7 +9,7 @@ spring: fabric8: masterUrl: https://192.168.0.1:8443 namespace: dev1 - imagePullPolicy: Always + imagePullPolicy: IfNotPresent entryPointStyle: exec limits: cpu: 4 diff --git a/spring-cloud-skipper/spring-cloud-skipper-platform-kubernetes/src/test/resources/application-platform-properties.yml b/spring-cloud-skipper/spring-cloud-skipper-platform-kubernetes/src/test/resources/application-platform-properties.yml index 8fe88f4123..d89813121a 100644 --- a/spring-cloud-skipper/spring-cloud-skipper-platform-kubernetes/src/test/resources/application-platform-properties.yml +++ b/spring-cloud-skipper/spring-cloud-skipper-platform-kubernetes/src/test/resources/application-platform-properties.yml @@ -13,7 +13,7 @@ spring: fabric8: masterUrl: https://192.168.0.1:8443 namespace: dev1 - imagePullPolicy: Always + imagePullPolicy: IfNotPresent entryPointStyle: exec limits: cpu: 4 diff --git a/src/carvel/config/dataflow-deployment.yml b/src/carvel/config/dataflow-deployment.yml index 0a5b364312..72e51f0eaf 100644 --- a/src/carvel/config/dataflow-deployment.yml +++ b/src/carvel/config/dataflow-deployment.yml @@ -33,7 +33,7 @@ spec: containers: - name: scdf-server image: #@ dataflow_image() - imagePullPolicy: Always + imagePullPolicy: IfNotPresent volumeMounts: - name: config mountPath: /workspace/config diff --git a/src/carvel/config/skipper-deployment.yml b/src/carvel/config/skipper-deployment.yml index 9a95a20918..e41e4be00f 100644 --- a/src/carvel/config/skipper-deployment.yml +++ b/src/carvel/config/skipper-deployment.yml @@ -28,7 +28,7 @@ spec: containers: - name: skipper image: #@ skipper_image() - imagePullPolicy: Always + imagePullPolicy: IfNotPresent volumeMounts: - name: config mountPath: /workspace/config diff --git a/src/kubernetes/server/server-deployment.yaml b/src/kubernetes/server/server-deployment.yaml index e8cd806fc9..ac667e49ac 100644 --- a/src/kubernetes/server/server-deployment.yaml +++ b/src/kubernetes/server/server-deployment.yaml @@ -17,7 +17,7 @@ spec: containers: - name: scdf-server image: springcloud/spring-cloud-dataflow-server:2.11.2-SNAPSHOT - imagePullPolicy: Always + imagePullPolicy: IfNotPresent volumeMounts: - name: config mountPath: /workspace/config diff --git a/src/kubernetes/skipper/skipper-deployment.yaml b/src/kubernetes/skipper/skipper-deployment.yaml index 961b721bb3..6c49e0d6b0 100644 --- a/src/kubernetes/skipper/skipper-deployment.yaml +++ b/src/kubernetes/skipper/skipper-deployment.yaml @@ -17,7 +17,7 @@ spec: containers: - name: skipper image: springcloud/spring-cloud-skipper-server:2.11.2-SNAPSHOT - imagePullPolicy: Always + imagePullPolicy: IfNotPresent volumeMounts: - name: config mountPath: /workspace/config