diff --git a/docs/book/src/cronjob-tutorial/testdata/project/config/manager/manager.yaml b/docs/book/src/cronjob-tutorial/testdata/project/config/manager/manager.yaml index 8fb2249a918..a4a6d279d1c 100644 --- a/docs/book/src/cronjob-tutorial/testdata/project/config/manager/manager.yaml +++ b/docs/book/src/cronjob-tutorial/testdata/project/config/manager/manager.yaml @@ -64,6 +64,7 @@ spec: - --leader-elect - --health-probe-bind-address=:8081 image: controller:latest + imagePullPolicy: IfNotPresent name: manager ports: [] securityContext: diff --git a/docs/book/src/cronjob-tutorial/testdata/project/dist/chart/templates/manager/manager.yaml b/docs/book/src/cronjob-tutorial/testdata/project/dist/chart/templates/manager/manager.yaml index d21ba52a883..800be0a90d2 100644 --- a/docs/book/src/cronjob-tutorial/testdata/project/dist/chart/templates/manager/manager.yaml +++ b/docs/book/src/cronjob-tutorial/testdata/project/dist/chart/templates/manager/manager.yaml @@ -34,6 +34,9 @@ spec: command: - /manager image: {{ .Values.controllerManager.container.image.repository }}:{{ .Values.controllerManager.container.image.tag }} + {{- if .Values.controllerManager.container.imagePullPolicy }} + imagePullPolicy: {{ .Values.controllerManager.container.imagePullPolicy }} + {{- end }} {{- if .Values.controllerManager.container.env }} env: {{- range $key, $value := .Values.controllerManager.container.env }} diff --git a/docs/book/src/cronjob-tutorial/testdata/project/dist/chart/values.yaml b/docs/book/src/cronjob-tutorial/testdata/project/dist/chart/values.yaml index 6f6e23f083c..52879a5615c 100644 --- a/docs/book/src/cronjob-tutorial/testdata/project/dist/chart/values.yaml +++ b/docs/book/src/cronjob-tutorial/testdata/project/dist/chart/values.yaml @@ -5,6 +5,7 @@ controllerManager: image: repository: controller tag: latest + imagePullPolicy: IfNotPresent args: - "--leader-elect" - "--metrics-bind-address=:8443" diff --git a/docs/book/src/cronjob-tutorial/testdata/project/dist/install.yaml b/docs/book/src/cronjob-tutorial/testdata/project/dist/install.yaml index 7d342a5524e..6e83c23ed53 100644 --- a/docs/book/src/cronjob-tutorial/testdata/project/dist/install.yaml +++ b/docs/book/src/cronjob-tutorial/testdata/project/dist/install.yaml @@ -4209,6 +4209,7 @@ spec: command: - /manager image: controller:latest + imagePullPolicy: IfNotPresent livenessProbe: httpGet: path: /healthz diff --git a/docs/book/src/getting-started/testdata/project/config/manager/manager.yaml b/docs/book/src/getting-started/testdata/project/config/manager/manager.yaml index 8fb2249a918..a4a6d279d1c 100644 --- a/docs/book/src/getting-started/testdata/project/config/manager/manager.yaml +++ b/docs/book/src/getting-started/testdata/project/config/manager/manager.yaml @@ -64,6 +64,7 @@ spec: - --leader-elect - --health-probe-bind-address=:8081 image: controller:latest + imagePullPolicy: IfNotPresent name: manager ports: [] securityContext: diff --git a/docs/book/src/getting-started/testdata/project/dist/chart/templates/manager/manager.yaml b/docs/book/src/getting-started/testdata/project/dist/chart/templates/manager/manager.yaml index 2fecf33314f..f32a67b2cff 100644 --- a/docs/book/src/getting-started/testdata/project/dist/chart/templates/manager/manager.yaml +++ b/docs/book/src/getting-started/testdata/project/dist/chart/templates/manager/manager.yaml @@ -34,6 +34,9 @@ spec: command: - /manager image: {{ .Values.controllerManager.container.image.repository }}:{{ .Values.controllerManager.container.image.tag }} + {{- if .Values.controllerManager.container.imagePullPolicy }} + imagePullPolicy: {{ .Values.controllerManager.container.imagePullPolicy }} + {{- end }} {{- if .Values.controllerManager.container.env }} env: {{- range $key, $value := .Values.controllerManager.container.env }} diff --git a/docs/book/src/getting-started/testdata/project/dist/chart/values.yaml b/docs/book/src/getting-started/testdata/project/dist/chart/values.yaml index f1817cdd495..8b45502619e 100644 --- a/docs/book/src/getting-started/testdata/project/dist/chart/values.yaml +++ b/docs/book/src/getting-started/testdata/project/dist/chart/values.yaml @@ -5,6 +5,7 @@ controllerManager: image: repository: controller tag: latest + imagePullPolicy: IfNotPresent args: - "--leader-elect" - "--metrics-bind-address=:8443" diff --git a/docs/book/src/getting-started/testdata/project/dist/install.yaml b/docs/book/src/getting-started/testdata/project/dist/install.yaml index 3261ac31f22..8fd8ba79329 100644 --- a/docs/book/src/getting-started/testdata/project/dist/install.yaml +++ b/docs/book/src/getting-started/testdata/project/dist/install.yaml @@ -442,6 +442,7 @@ spec: command: - /manager image: controller:latest + imagePullPolicy: IfNotPresent livenessProbe: httpGet: path: /healthz diff --git a/docs/book/src/multiversion-tutorial/testdata/project/config/manager/manager.yaml b/docs/book/src/multiversion-tutorial/testdata/project/config/manager/manager.yaml index 8fb2249a918..a4a6d279d1c 100644 --- a/docs/book/src/multiversion-tutorial/testdata/project/config/manager/manager.yaml +++ b/docs/book/src/multiversion-tutorial/testdata/project/config/manager/manager.yaml @@ -64,6 +64,7 @@ spec: - --leader-elect - --health-probe-bind-address=:8081 image: controller:latest + imagePullPolicy: IfNotPresent name: manager ports: [] securityContext: diff --git a/docs/book/src/multiversion-tutorial/testdata/project/dist/chart/templates/manager/manager.yaml b/docs/book/src/multiversion-tutorial/testdata/project/dist/chart/templates/manager/manager.yaml index d21ba52a883..800be0a90d2 100644 --- a/docs/book/src/multiversion-tutorial/testdata/project/dist/chart/templates/manager/manager.yaml +++ b/docs/book/src/multiversion-tutorial/testdata/project/dist/chart/templates/manager/manager.yaml @@ -34,6 +34,9 @@ spec: command: - /manager image: {{ .Values.controllerManager.container.image.repository }}:{{ .Values.controllerManager.container.image.tag }} + {{- if .Values.controllerManager.container.imagePullPolicy }} + imagePullPolicy: {{ .Values.controllerManager.container.imagePullPolicy }} + {{- end }} {{- if .Values.controllerManager.container.env }} env: {{- range $key, $value := .Values.controllerManager.container.env }} diff --git a/docs/book/src/multiversion-tutorial/testdata/project/dist/chart/values.yaml b/docs/book/src/multiversion-tutorial/testdata/project/dist/chart/values.yaml index 6f6e23f083c..52879a5615c 100644 --- a/docs/book/src/multiversion-tutorial/testdata/project/dist/chart/values.yaml +++ b/docs/book/src/multiversion-tutorial/testdata/project/dist/chart/values.yaml @@ -5,6 +5,7 @@ controllerManager: image: repository: controller tag: latest + imagePullPolicy: IfNotPresent args: - "--leader-elect" - "--metrics-bind-address=:8443" diff --git a/docs/book/src/multiversion-tutorial/testdata/project/dist/install.yaml b/docs/book/src/multiversion-tutorial/testdata/project/dist/install.yaml index 63469894196..6e8ccb71aaa 100644 --- a/docs/book/src/multiversion-tutorial/testdata/project/dist/install.yaml +++ b/docs/book/src/multiversion-tutorial/testdata/project/dist/install.yaml @@ -8102,6 +8102,7 @@ spec: command: - /manager image: controller:latest + imagePullPolicy: IfNotPresent livenessProbe: httpGet: path: /healthz diff --git a/go.mod b/go.mod index 1d6a094e73b..f1a4f0d34da 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,7 @@ go 1.24.5 require ( github.com/gobuffalo/flect v1.0.3 + github.com/h2non/gock v1.2.0 github.com/onsi/ginkgo/v2 v2.23.4 github.com/onsi/gomega v1.38.0 github.com/sirupsen/logrus v1.9.3 @@ -23,7 +24,6 @@ require ( github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/google/go-cmp v0.7.0 // indirect github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect - github.com/h2non/gock v1.2.0 // indirect github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/kr/pretty v0.3.1 // indirect diff --git a/go.sum b/go.sum index 3be0e6d3cef..620b8768535 100644 --- a/go.sum +++ b/go.sum @@ -31,6 +31,7 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32 h1:W6apQkHrMkS0Muv8G/TipAy/FJl/rCYT0+EuS8+Z0z4= github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms= github.com/onsi/ginkgo/v2 v2.23.4 h1:ktYTpKJAVZnDT4VjxSbiBenUjmlL/5QkBEocaWXiQus= github.com/onsi/ginkgo/v2 v2.23.4/go.mod h1:Bt66ApGPBFzHyR+JO10Zbt0Gsp4uWxu5mIOTusL46e8= diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/manager/config.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/manager/config.go index de91d28a6ea..a09fa957321 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/manager/config.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/manager/config.go @@ -110,6 +110,7 @@ spec: - --leader-elect - --health-probe-bind-address=:8081 image: {{ .Image }} + imagePullPolicy: IfNotPresent name: manager ports: [] securityContext: diff --git a/pkg/plugins/optional/helm/v1alpha/scaffolds/internal/templates/chart-templates/manager/manager.go b/pkg/plugins/optional/helm/v1alpha/scaffolds/internal/templates/chart-templates/manager/manager.go index e6b2cdf36ba..25099ff68d4 100644 --- a/pkg/plugins/optional/helm/v1alpha/scaffolds/internal/templates/chart-templates/manager/manager.go +++ b/pkg/plugins/optional/helm/v1alpha/scaffolds/internal/templates/chart-templates/manager/manager.go @@ -91,6 +91,9 @@ spec: command: - /manager image: {{ "{{ .Values.controllerManager.container.image.repository }}" }}:{{ "{{ .Values.controllerManager.container.image.tag }}" }} + {{ "{{- if .Values.controllerManager.container.imagePullPolicy }}" }} + imagePullPolicy: {{ "{{ .Values.controllerManager.container.imagePullPolicy }}" }} + {{ "{{- end }}" }} {{ "{{- if .Values.controllerManager.container.env }}" }} env: {{ "{{- range $key, $value := .Values.controllerManager.container.env }}" }} diff --git a/pkg/plugins/optional/helm/v1alpha/scaffolds/internal/templates/values.go b/pkg/plugins/optional/helm/v1alpha/scaffolds/internal/templates/values.go index 86942894636..d24e2ec3884 100644 --- a/pkg/plugins/optional/helm/v1alpha/scaffolds/internal/templates/values.go +++ b/pkg/plugins/optional/helm/v1alpha/scaffolds/internal/templates/values.go @@ -59,6 +59,7 @@ controllerManager: image: repository: controller tag: latest + imagePullPolicy: IfNotPresent args: - "--leader-elect" - "--metrics-bind-address=:8443" diff --git a/testdata/project-v4-multigroup/config/manager/manager.yaml b/testdata/project-v4-multigroup/config/manager/manager.yaml index 6595f5d2236..08c147fdc90 100644 --- a/testdata/project-v4-multigroup/config/manager/manager.yaml +++ b/testdata/project-v4-multigroup/config/manager/manager.yaml @@ -64,6 +64,7 @@ spec: - --leader-elect - --health-probe-bind-address=:8081 image: controller:latest + imagePullPolicy: IfNotPresent name: manager env: - name: BUSYBOX_IMAGE diff --git a/testdata/project-v4-multigroup/dist/install.yaml b/testdata/project-v4-multigroup/dist/install.yaml index dcfa312b512..8a05cc9946b 100644 --- a/testdata/project-v4-multigroup/dist/install.yaml +++ b/testdata/project-v4-multigroup/dist/install.yaml @@ -2947,6 +2947,7 @@ spec: - name: MEMCACHED_IMAGE value: memcached:1.6.26-alpine3.19 image: controller:latest + imagePullPolicy: IfNotPresent livenessProbe: httpGet: path: /healthz diff --git a/testdata/project-v4-with-plugins/config/manager/manager.yaml b/testdata/project-v4-with-plugins/config/manager/manager.yaml index 82c7dbc38c3..faf0e3f8257 100644 --- a/testdata/project-v4-with-plugins/config/manager/manager.yaml +++ b/testdata/project-v4-with-plugins/config/manager/manager.yaml @@ -64,6 +64,7 @@ spec: - --leader-elect - --health-probe-bind-address=:8081 image: controller:latest + imagePullPolicy: IfNotPresent name: manager env: - name: BUSYBOX_IMAGE diff --git a/testdata/project-v4-with-plugins/dist/chart/templates/manager/manager.yaml b/testdata/project-v4-with-plugins/dist/chart/templates/manager/manager.yaml index f37cfc16711..814b31c97ef 100644 --- a/testdata/project-v4-with-plugins/dist/chart/templates/manager/manager.yaml +++ b/testdata/project-v4-with-plugins/dist/chart/templates/manager/manager.yaml @@ -34,6 +34,9 @@ spec: command: - /manager image: {{ .Values.controllerManager.container.image.repository }}:{{ .Values.controllerManager.container.image.tag }} + {{- if .Values.controllerManager.container.imagePullPolicy }} + imagePullPolicy: {{ .Values.controllerManager.container.imagePullPolicy }} + {{- end }} {{- if .Values.controllerManager.container.env }} env: {{- range $key, $value := .Values.controllerManager.container.env }} diff --git a/testdata/project-v4-with-plugins/dist/chart/values.yaml b/testdata/project-v4-with-plugins/dist/chart/values.yaml index 89757cd37f7..93478fc72db 100644 --- a/testdata/project-v4-with-plugins/dist/chart/values.yaml +++ b/testdata/project-v4-with-plugins/dist/chart/values.yaml @@ -5,6 +5,7 @@ controllerManager: image: repository: controller tag: latest + imagePullPolicy: IfNotPresent args: - "--leader-elect" - "--metrics-bind-address=:8443" diff --git a/testdata/project-v4-with-plugins/dist/install.yaml b/testdata/project-v4-with-plugins/dist/install.yaml index aeb1a3eb82e..40f96e492d0 100644 --- a/testdata/project-v4-with-plugins/dist/install.yaml +++ b/testdata/project-v4-with-plugins/dist/install.yaml @@ -992,6 +992,7 @@ spec: - name: MEMCACHED_IMAGE value: memcached:1.6.26-alpine3.19 image: controller:latest + imagePullPolicy: IfNotPresent livenessProbe: httpGet: path: /healthz diff --git a/testdata/project-v4/config/manager/manager.yaml b/testdata/project-v4/config/manager/manager.yaml index 90cbcc10c8f..7251f2ec682 100644 --- a/testdata/project-v4/config/manager/manager.yaml +++ b/testdata/project-v4/config/manager/manager.yaml @@ -64,6 +64,7 @@ spec: - --leader-elect - --health-probe-bind-address=:8081 image: controller:latest + imagePullPolicy: IfNotPresent name: manager ports: [] securityContext: diff --git a/testdata/project-v4/dist/install.yaml b/testdata/project-v4/dist/install.yaml index a00b03e2c57..50c6c247ad5 100644 --- a/testdata/project-v4/dist/install.yaml +++ b/testdata/project-v4/dist/install.yaml @@ -975,6 +975,7 @@ spec: command: - /manager image: controller:latest + imagePullPolicy: IfNotPresent livenessProbe: httpGet: path: /healthz