Merge pull request #119 from banzaicloud/airgap

Image repository related fixes
banzaicloud · Oct 8, 2020 · 46ee9bd · 46ee9bd
2 parents b3ca246 + d5cfe4b
commit 46ee9bd
Show file tree

Hide file tree

Showing 9 changed files with 66 additions and 28 deletions.
diff --git a/cmd/pke/app/phases/kubeadm/controlplane/certificate_auto_approver.yaml.go b/cmd/pke/app/phases/kubeadm/controlplane/certificate_auto_approver.yaml.go
@@ -94,7 +94,7 @@ func certificateAutoApproverTemplate() string {
 		"      priorityClassName: system-cluster-critical\n" +
 		"      containers:\n" +
 		"        - name: auto-approver\n" +
-		"          image: banzaicloud/auto-approver:0.1.0\n" +
+		"          image: {{ .ImageRepository }}/auto-approver:0.1.0\n" +
 		"          imagePullPolicy: Always\n" +
 		"          env:\n" +
 		"            - name: WATCH_NAMESPACE\n" +

diff --git a/cmd/pke/app/phases/kubeadm/controlplane/certificate_auto_approver.yaml.tmpl b/cmd/pke/app/phases/kubeadm/controlplane/certificate_auto_approver.yaml.tmpl
@@ -76,7 +76,7 @@ spec:
       priorityClassName: system-cluster-critical
       containers:
         - name: auto-approver
-          image: banzaicloud/auto-approver:0.1.0
+          image: {{ .ImageRepository }}/auto-approver:0.1.0
           imagePullPolicy: Always
           env:
             - name: WATCH_NAMESPACE

diff --git a/cmd/pke/app/phases/kubeadm/controlplane/cilium.yaml.go b/cmd/pke/app/phases/kubeadm/controlplane/cilium.yaml.go
@@ -390,7 +390,7 @@ func ciliumTemplate() string {
 		"              key: custom-cni-conf\n" +
 		"              name: cilium-config\n" +
 		"              optional: true\n" +
-		"        image: \"docker.io/cilium/cilium:v1.6.4\"\n" +
+		"        image: \"{{ .ImageRepository }}/cilium:v1.6.4\"\n" +
 		"        imagePullPolicy: IfNotPresent\n" +
 		"        lifecycle:\n" +
 		"          postStart:\n" +
@@ -477,7 +477,7 @@ func ciliumTemplate() string {
 		"              key: wait-bpf-mount\n" +
 		"              name: cilium-config\n" +
 		"              optional: true\n" +
-		"        image: \"docker.io/cilium/cilium:v1.6.4\"\n" +
+		"        image: \"{{ .ImageRepository }}/cilium:v1.6.4\"\n" +
 		"        imagePullPolicy: IfNotPresent\n" +
 		"        name: clean-cilium-state\n" +
 		"        securityContext:\n" +
@@ -652,7 +652,7 @@ func ciliumTemplate() string {
 		"              key: identity-allocation-mode\n" +
 		"              name: cilium-config\n" +
 		"              optional: true\n" +
-		"        image: \"docker.io/cilium/operator:v1.6.4\"\n" +
+		"        image: \"{{ .ImageRepository }}/cilium-operator:v1.6.4\"\n" +
 		"        imagePullPolicy: IfNotPresent\n" +
 		"        name: cilium-operator\n" +
 		"        livenessProbe:\n" +

diff --git a/cmd/pke/app/phases/kubeadm/controlplane/cilium.yaml.tmpl b/cmd/pke/app/phases/kubeadm/controlplane/cilium.yaml.tmpl
@@ -372,7 +372,7 @@ spec:
               key: custom-cni-conf
               name: cilium-config
               optional: true
-        image: "docker.io/cilium/cilium:v1.6.4"
+        image: "{{ .ImageRepository }}/cilium:v1.6.4"
         imagePullPolicy: IfNotPresent
         lifecycle:
           postStart:
@@ -459,7 +459,7 @@ spec:
               key: wait-bpf-mount
               name: cilium-config
               optional: true
-        image: "docker.io/cilium/cilium:v1.6.4"
+        image: "{{ .ImageRepository }}/cilium:v1.6.4"
         imagePullPolicy: IfNotPresent
         name: clean-cilium-state
         securityContext:
@@ -634,7 +634,7 @@ spec:
               key: identity-allocation-mode
               name: cilium-config
               optional: true
-        image: "docker.io/cilium/operator:v1.6.4"
+        image: "{{ .ImageRepository }}/cilium-operator:v1.6.4"
         imagePullPolicy: IfNotPresent
         name: cilium-operator
         livenessProbe:

diff --git a/cmd/pke/app/phases/kubeadm/controlplane/controlplane.go b/cmd/pke/app/phases/kubeadm/controlplane/controlplane.go
@@ -15,6 +15,7 @@
 package controlplane
 
 import (
+	"bytes"
 	"context"
 	"crypto/tls"
 	"encoding/base64"
@@ -496,7 +497,7 @@ func (c *ControlPlane) Run(out io.Writer) error {
 			return err
 		}
 	case constants.NetworkProviderCilium:
-		if err := installCilium(out, kubeConfig, c.mtu); err != nil {
+		if err := installCilium(out, kubeConfig, c.imageRepository, c.mtu); err != nil {
 			return err
 		}
 	}
@@ -860,7 +861,7 @@ func (c *ControlPlane) installMaster(out io.Writer) error {
 	}
 
 	// apply AutoApprover
-	if err := writeCertificateAutoApprover(out); err != nil {
+	if err := writeCertificateAutoApprover(out, c.imageRepository); err != nil {
 		return err
 	}
 	// apply PSP
@@ -877,7 +878,7 @@ func (c *ControlPlane) installMaster(out io.Writer) error {
 	}
 
 	// apply default storage class
-	if err := applyDefaultStorageClass(out, c.disableDefaultStorageClass, c.cloudProvider, c.azureStorageAccountType, c.azureStorageKind); err != nil {
+	if err := applyDefaultStorageClass(out, c.disableDefaultStorageClass, c.cloudProvider, c.azureStorageAccountType, c.azureStorageKind, c.imageRepository); err != nil {
 		return err
 	}
 
@@ -937,7 +938,7 @@ func installWeave(out io.Writer, cloudProvider, podNetworkCIDR, kubeConfig strin
 //go:generate templify -t ${GOTMPL} -p controlplane -f cilium cilium.yaml.tmpl
 //go:generate templify -t ${GOTMPL} -p controlplane -f ciliumSysFsBpf cilium_sys_fs_bpf.mount.tmpl
 
-func installCilium(out io.Writer, kubeConfig string, mtu uint) error {
+func installCilium(out io.Writer, kubeConfig string, imageRepository string, mtu uint) error {
 	if _, err := os.Stat("/sys/fs/bpf"); err != nil {
 		// Mounting BPF filesystem
 		if err := file.Overwrite(ciliumBpfMountSystemd, ciliumSysFsBpfTemplate()); err != nil {
@@ -949,11 +950,29 @@ func installCilium(out io.Writer, kubeConfig string, mtu uint) error {
 	}
 
 	// https://raw.githubusercontent.com/cilium/cilium/v1.6/install/kubernetes/quick-install.yaml
-	input := ciliumTemplate()
+	tmpl, err := template.New("").Parse(ciliumTemplate())
+	if err != nil {
+		return err
+	}
+
+	type data struct {
+		ImageRepository string
+	}
+
+	d := data{
+		ImageRepository: imageRepository,
+	}
+
+	var b bytes.Buffer
+	err = tmpl.Execute(&b, d)
+	if err != nil {
+		return err
+	}
+
 	cmd := runner.Cmd(out, cmdKubectl, "apply", "-f", "-")
 	cmd.Env = append(os.Environ(), "KUBECONFIG="+kubeConfig)
-	cmd.Stdin = strings.NewReader(input)
-	_, err := cmd.CombinedOutputAsync()
+	cmd.Stdin = strings.NewReader(b.String())
+	_, err = cmd.CombinedOutputAsync()
 	return err
 }
 
@@ -1042,7 +1061,7 @@ func taintRemoveNoSchedule(out io.Writer, clusterMode, kubeConfig string) error
 
 //go:generate templify -t ${GOTMPL} -p controlplane -f certificateAutoApprover certificate_auto_approver.yaml.tmpl
 
-func writeCertificateAutoApprover(out io.Writer) error {
+func writeCertificateAutoApprover(out io.Writer, imageRepository string) error {
 	filename := certificateAutoApprover
 	dir := filepath.Dir(filename)
 
@@ -1052,7 +1071,26 @@ func writeCertificateAutoApprover(out io.Writer) error {
 		return err
 	}
 
-	err = file.Overwrite(filename, certificateAutoApproverTemplate())
+	tmpl, err := template.New("").Parse(certificateAutoApproverTemplate())
+	if err != nil {
+		return err
+	}
+
+	type data struct {
+		ImageRepository string
+	}
+
+	d := data{
+		ImageRepository: imageRepository,
+	}
+
+	var b bytes.Buffer
+	err = tmpl.Execute(&b, d)
+	if err != nil {
+		return err
+	}
+
+	err = file.Overwrite(filename, b.String())
 	if err != nil {
 		return err
 	}

diff --git a/cmd/pke/app/phases/kubeadm/controlplane/storage_class.go b/cmd/pke/app/phases/kubeadm/controlplane/storage_class.go
@@ -27,7 +27,7 @@ import (
 	"github.com/banzaicloud/pke/cmd/pke/app/util/runner"
 )
 
-func applyDefaultStorageClass(out io.Writer, disableDefaultStorageClass bool, cloudProvider string, azureStorageAccountType, azureStorageKind string) error {
+func applyDefaultStorageClass(out io.Writer, disableDefaultStorageClass bool, cloudProvider string, azureStorageAccountType, azureStorageKind string, imageRepository string) error {
 	if disableDefaultStorageClass {
 		return nil
 	}
@@ -44,7 +44,7 @@ func applyDefaultStorageClass(out io.Writer, disableDefaultStorageClass bool, cl
 		// TODO: out-of-tree CSI volume plugins
 		return nil
 	default:
-		err = writeStorageClassLocalPathStorage(out, storageClassConfig)
+		err = writeStorageClassLocalPathStorage(out, storageClassConfig, imageRepository)
 	}
 	if err != nil {
 		return err
@@ -148,17 +148,21 @@ func writeStorageClassAzure(out io.Writer, filename string, storageAccountType,
 
 //go:generate templify -t ${GOTMPL} -p controlplane -f storageClassLocalPathStorage storage_class_local_path_storage.yaml.tmpl
 
-func writeStorageClassLocalPathStorage(out io.Writer, filename string) error {
+func writeStorageClassLocalPathStorage(out io.Writer, filename string, imageRepository string) error {
 	_, _ = fmt.Fprintf(out, "[%s] creating local default storage class\n", use)
 
 	tmpl, err := template.New("storage-class-local-path").Parse(storageClassLocalPathStorageTemplate())
 	if err != nil {
 		return err
 	}
 
-	type data struct{}
+	type data struct {
+		ImageRepository string
+	}
 
-	d := data{}
+	d := data{
+		ImageRepository: imageRepository,
+	}
 
 	return file.WriteTemplate(filename, tmpl, d)
 }
diff --git a/cmd/pke/app/phases/kubeadm/controlplane/storage_class_local_path_storage.yaml.go b/cmd/pke/app/phases/kubeadm/controlplane/storage_class_local_path_storage.yaml.go
@@ -73,7 +73,7 @@ func storageClassLocalPathStorageTemplate() string {
 		"      serviceAccountName: local-path-provisioner-service-account\n" +
 		"      containers:\n" +
 		"      - name: local-path-provisioner\n" +
-		"        image: banzaicloud/local-path-provisioner:v0.0.9\n" +
+		"        image: {{ .ImageRepository }}/local-path-provisioner:v0.0.9\n" +
 		"        imagePullPolicy: Always\n" +
 		"        command:\n" +
 		"        - local-path-provisioner\n" +

diff --git a/cmd/pke/app/phases/kubeadm/controlplane/storage_class_local_path_storage.yaml.tmpl b/cmd/pke/app/phases/kubeadm/controlplane/storage_class_local_path_storage.yaml.tmpl
@@ -55,7 +55,7 @@ spec:
       serviceAccountName: local-path-provisioner-service-account
       containers:
       - name: local-path-provisioner
-        image: banzaicloud/local-path-provisioner:v0.0.9
+        image: {{ .ImageRepository }}/local-path-provisioner:v0.0.9
         imagePullPolicy: Always
         command:
         - local-path-provisioner

diff --git a/cmd/pke/app/util/linux/dnf.go b/cmd/pke/app/util/linux/dnf.go
@@ -94,10 +94,6 @@ func (y *DnfInstaller) InstallKubernetesPrerequisites(out io.Writer, kubernetesV
 		}
 	}
 
-	if _, err := runner.Cmd(out, cmdDnf, "update", "-y").CombinedOutputAsync(); err != nil {
-		return err
-	}
-
 	return nil
 }