fix: rename pull secret parameter as per suggestion

nearform · Aug 31, 2023 · fd060f7 · fd060f7
1 parent 1404f18
commit fd060f7
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/assets/knative/service.yaml.tmpl b/assets/knative/service.yaml.tmpl
@@ -6,9 +6,9 @@ metadata:
 spec:
   template:
     spec:
-      {{ if ne .RegistrySecret "" }}
+      {{ if ne .ImagePullSecrets "" }}
       imagePullSecrets:
-        - name: {{ .RegistrySecret }}
+        - name: {{ .ImagePullSecrets }}
       {{ end }}
       containers:
         - image: {{ .RemoteTag }}

diff --git a/src/cli/cli.go b/src/cli/cli.go
@@ -67,7 +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)
+	imagePullSecrets := cCtx.String(imagePullSecretsFlag)
 	dockerFileName := cCtx.String(dockerFileNameFlag)
 
 	if dockerFileName == "" {
@@ -84,7 +84,7 @@ func (c *icli) init(cCtx *cli.Context) error {
 		projectDirectory,
 		cCtx.String(runtimeVersionFlag),
 		version,
-		registrySecret,
+		imagePullSecrets,
 		c.Resources,
 	)
 

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

diff --git a/src/services/k8s/knative.go b/src/services/k8s/knative.go
@@ -48,7 +48,7 @@ func loadManifest(project *project.Project, dockerImage docker.DockerImage) (*se
 	templateParams := map[string]interface{}{
 		"Name": dockerImage.Name,
 		"RemoteTag": dockerImage.RemoteTag(),
-		"RegistrySecret": project.RegistrySecret,
+		"ImagePullSecrets": project.ImagePullSecrets,
 	}
 
 	output := &bytes.Buffer{}

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