Merge pull request micro#1565 from micro/image-pull-secret-fix

Runtime: Fix ImagePullSecret
handlemail · Apr 23, 2020 · 986e3d3 · 986e3d3
2 parents ec929b3 + 616db34
commit 986e3d3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/runtime/kubernetes/kubernetes.go b/runtime/kubernetes/kubernetes.go
@@ -38,6 +38,8 @@ func (k *kubernetes) namespaceExists(name string) (bool, error) {
 			return false, err
 		}
 		k.namespaces = namespaceList.Items
+		fmt.Println("HERE")
+		fmt.Println(k.namespaces)
 	}
 
 	// check if the namespace exists in the cache

diff --git a/runtime/kubernetes/service.go b/runtime/kubernetes/service.go
@@ -39,7 +39,10 @@ func newService(s *runtime.Service, c runtime.CreateOptions) *service {
 	}
 
 	// set the image pull secrets
-	kdeploy.Spec.Template.PodSpec.ImagePullSecrets = c.ImagePullSecrets
+	kdeploy.Spec.Template.PodSpec.ImagePullSecrets = make([]client.ImagePullSecret, len(c.ImagePullSecrets))
+	for i, s := range c.ImagePullSecrets {
+		kdeploy.Spec.Template.PodSpec.ImagePullSecrets[i] = client.ImagePullSecret{Name: s}
+	}
 
 	// create if non existent
 	if s.Metadata == nil {

diff --git a/util/kubernetes/client/templates.go b/util/kubernetes/client/templates.go
@@ -53,7 +53,7 @@ spec:
       imagePullSecrets:
       {{- with .Spec.Template.PodSpec.ImagePullSecrets }}
       {{- range . }}
-      - name: "{{.}}"
+      - name: "{{ .Name }}"
       {{- end }}
       {{- end }}
       containers:

diff --git a/util/kubernetes/client/types.go b/util/kubernetes/client/types.go
@@ -93,8 +93,8 @@ type Metadata struct {
 
 // PodSpec is a pod
 type PodSpec struct {
-	Containers       []Container `json:"containers"`
-	ImagePullSecrets []string    `json:"imagePullSecrets"`
+	Containers       []Container       `json:"containers"`
+	ImagePullSecrets []ImagePullSecret `json:"imagePullSecrets"`
 }
 
 // PodList
@@ -189,3 +189,8 @@ type Namespace struct {
 type NamespaceList struct {
 	Items []Namespace `json:"items"`
 }
+
+// ImagePullSecret
+type ImagePullSecret struct {
+	Name string `json:"name"`
+}