Allow to override the pull policy of the controller in 'kudo init' (#…

…1507)

This makes it easier to deploy KUDO in test environments where a KUDO image is available in the cluster but not in any repository.

Signed-off-by: Jan Schlicht <jan@d2iq.com>

Co-authored-by: Andreas Neumann <aneumann@mesosphere.com>

hack/run-e2e-tests.sh

@@ -13,8 +13,10 @@ docker build . \
     -t "kudobuilder/controller:$VERSION"
 
 # Generate the kudo.yaml that is used to install KUDO while running e2e-test
-./bin/kubectl-kudo init --webhook InstanceValidation --unsafe-self-signed-webhook-ca --dry-run --output yaml --kudo-image kudobuilder/controller:$VERSION \
-    | sed -E -e '/imagePullPolicy/ s/Always/Never/' \
+./bin/kubectl-kudo init --webhook InstanceValidation \
+    --unsafe-self-signed-webhook-ca --dry-run --output yaml \
+    --kudo-image kudobuilder/controller:$VERSION \
+    --kudo-image-pull-policy Never \
     > test/manifests/kudo.yaml
 
 sed "s/%version%/$VERSION/" kudo-e2e-test.yaml.tmpl > kudo-e2e-test.yaml

pkg/kudoctl/cmd/init.go

@@ -62,6 +62,7 @@ type initCmd struct {
 	out                 io.Writer
 	fs                  afero.Fs
 	image               string
+	imagePullPolicy     string
 	dryRun              bool
 	output              string
 	version             string
@@ -102,6 +103,7 @@ func newInitCmd(fs afero.Fs, out io.Writer) *cobra.Command {
 	f := cmd.Flags()
 	f.BoolVarP(&i.clientOnly, "client-only", "c", false, "If set does not install KUDO on the server")
 	f.StringVarP(&i.image, "kudo-image", "i", "", "Override KUDO controller image and/or version")
+	f.StringVarP(&i.imagePullPolicy, "kudo-image-pull-policy", "", "", "Override KUDO controller image pull policy")
 	f.StringVarP(&i.version, "version", "", "", "Override KUDO controller version of the KUDO image")
 	f.StringVarP(&i.output, "output", "o", "", "Output format")
 	f.BoolVar(&i.dryRun, "dry-run", false, "Do not install local or remote")
@@ -148,6 +150,17 @@ func (initCmd *initCmd) run() error {
 	if initCmd.image != "" {
 		opts.Image = initCmd.image
 	}
+	if initCmd.imagePullPolicy != "" {
+		switch initCmd.imagePullPolicy {
+		case
+			"Always",
+			"Never",
+			"IfNotPresent":
+			opts.ImagePullPolicy = initCmd.imagePullPolicy
+		default:
+			return fmt.Errorf("Unknown image pull policy %s, must be one of 'Always', 'IfNotPresent' or 'Never'", initCmd.imagePullPolicy)
+		}
+	}
 
 	//TODO: implement output=yaml|json (define a type for output to constrain)
 	//define an Encoder to replace YAMLWriter

pkg/kudoctl/kudoinit/manager/manager.go

@@ -99,6 +99,7 @@ func generateDeployment(opts kudoinit.Options) *appsv1.StatefulSet {
 
 	secretDefaultMode := int32(420)
 	image := opts.Image
+	imagePullPolicy := v1.PullPolicy(opts.ImagePullPolicy)
 	s := &appsv1.StatefulSet{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       "StatefulSet",
@@ -127,7 +128,7 @@ func generateDeployment(opts kudoinit.Options) *appsv1.StatefulSet {
 								{Name: "ENABLE_WEBHOOKS", Value: strconv.FormatBool(opts.HasWebhooksEnabled())},
 							},
 							Image:           image,
-							ImagePullPolicy: "Always",
+							ImagePullPolicy: imagePullPolicy,
 							Name:            "manager",
 							Ports: []v1.ContainerPort{
 								// name matters for service

pkg/kudoctl/kudoinit/options.go

@@ -16,6 +16,8 @@ type Options struct {
 	TerminationGracePeriodSeconds int64
 	// Image defines the image to be used
 	Image string
+	// ImagePullPolicy sets the pull policy of the image
+	ImagePullPolicy string
 	// List of enabled webhooks
 	Webhooks []string
 	// Using self-signed webhook CA bundle
@@ -40,6 +42,7 @@ func NewOptions(v string, ns string, sa string, webhooks []string, selfSignedWeb
 		Namespace:                     ns,
 		TerminationGracePeriodSeconds: defaultGracePeriod,
 		Image:                         fmt.Sprintf("kudobuilder/controller:v%v", v),
+		ImagePullPolicy:               "Always",
 		Webhooks:                      webhooks,
 		ServiceAccount:                sa,
 		SelfSignedWebhookCA:           selfSignedWebhookCA,