feature: added registry-secret param / envvar to allow setting custom…

… private registry credentials in knative service manifest
nearform · Aug 30, 2023 · 6b04b0e · 6b04b0e
1 parent feeefe0
commit 6b04b0e
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 2 deletions.
diff --git a/assets/knative/service.yaml.tmpl b/assets/knative/service.yaml.tmpl
@@ -6,6 +6,10 @@ metadata:
 spec:
   template:
     spec:
+      {{ if ne .RegistrySecret "" }}
+      imagePullSecrets:
+        - name: {{ .RegistrySecret }}
+      {{ end }}
       containers:
         - image: {{ .RemoteTag }}
           imagePullPolicy: Always
diff --git a/src/cli/cli.go b/src/cli/cli.go
@@ -67,6 +67,7 @@ func (c *icli) init(cCtx *cli.Context) error {
 	projectDirectory := cCtx.String(projectDirectoryFlag)
 	absProjectDirectory, err := filepath.Abs(cCtx.String(projectDirectoryFlag))
 	registry := cCtx.String(repoNameFlag)
+	registrySecret := cCtx.String(registrySecretFlag)
 	dockerFileName := cCtx.String(dockerFileNameFlag)
 
 	if dockerFileName == "" {
@@ -83,6 +84,7 @@ func (c *icli) init(cCtx *cli.Context) error {
 		projectDirectory,
 		cCtx.String(runtimeVersionFlag),
 		version,
+		registrySecret,
 		c.Resources,
 	)
 

diff --git a/src/cli/flags.go b/src/cli/flags.go
@@ -42,6 +42,7 @@ const (
 	dockerFileNameFlag    string = "dockerfile-name"
 	configFileFlag        string = "config-file"
 	namespaceFlag         string = "namespace"
+	registrySecretFlag    string = "registry-secret"
 	stopOnBuildFlag       string = "stop-on-build"
 	stopOnPushFlag        string = "stop-on-push"
 )
@@ -100,6 +101,12 @@ func InitFlags() flags {
 					Required: true,
 					Category: "deploy",
 				},
+				&cli.StringFlag{
+					Name:     registrySecretFlag,
+					EnvVars:  []string{"INITIUM_REGISTRY_SECRET"},
+					Required: false,
+					Category: "deploy",
+				},
 			},
 			Registry: []cli.Flag{
 				&cli.StringFlag{

diff --git a/src/services/k8s/knative.go b/src/services/k8s/knative.go
@@ -45,9 +45,15 @@ func loadManifest(project *project.Project, dockerImage docker.DockerImage) (*se
 		return nil, fmt.Errorf("error reading the knative service yaml: %v", err)
 	}
 
+	templateParams := map[string]interface{}{
+		"Name": dockerImage.Name,
+		"RemoteTag": dockerImage.RemoteTag(),
+		"RegistrySecret": project.RegistrySecret,
+	}
+
 	output := &bytes.Buffer{}
 	// TODO replace map[string]string{} with proper values
-	if err = template.Execute(output, dockerImage); err != nil {
+	if err = template.Execute(output, templateParams); err != nil {
 		return nil, err
 	}
 

diff --git a/src/services/project/project.go b/src/services/project/project.go
@@ -25,6 +25,7 @@ type Project struct {
 	Directory             string
 	RuntimeVersion        string
 	DefaultRuntimeVersion string
+	RegistrySecret        string
 	Resources             fs.FS
 }
 
@@ -46,11 +47,12 @@ func GuessAppName() *string {
 	return &name
 }
 
-func New(name string, directory string, runtimeVersion string, version string, resources fs.FS) Project {
+func New(name string, directory string, runtimeVersion string, version string, registrySecret string, resources fs.FS) Project {
 	return Project{
 		Name:           name,
 		Directory:      directory,
 		RuntimeVersion: runtimeVersion,
+		RegistrySecret: registrySecret,
 		Resources:      resources,
 		Version:        version,
 	}