add namespaceOverride support for privateRegistry

remove namespaceOverride in v1alpha1
kubesphere · Feb 10, 2022 · be8cda6 · be8cda6
1 parent 9d4f7c2
commit be8cda6
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/apis/kubekey/v1alpha2/cluster_types.go b/apis/kubekey/v1alpha2/cluster_types.go
@@ -18,11 +18,12 @@ package v1alpha2
 
 import (
 	"fmt"
-	"github.com/kubesphere/kubekey/pkg/core/connector"
 	"regexp"
 	"strconv"
 	"strings"
 
+	"github.com/kubesphere/kubekey/pkg/core/connector"
+
 	"github.com/kubesphere/kubekey/pkg/core/logger"
 	"github.com/kubesphere/kubekey/pkg/core/util"
 	"github.com/pkg/errors"
@@ -173,6 +174,7 @@ type RegistryConfig struct {
 	RegistryMirrors    []string             `yaml:"registryMirrors" json:"registryMirrors,omitempty"`
 	InsecureRegistries []string             `yaml:"insecureRegistries" json:"insecureRegistries,omitempty"`
 	PrivateRegistry    string               `yaml:"privateRegistry" json:"privateRegistry,omitempty"`
+	NamespaceOverride  string               `yaml:"namespaceOverride" json:"namespaceOverride,omitempty"`
 	PlainHTTP          bool                 `yaml:"plainHTTP" json:"plainHTTP,omitempty"`
 	Auths              runtime.RawExtension `yaml:"auths" json:"auths,omitempty"`
 }

diff --git a/docs/config-example.md b/docs/config-example.md
@@ -52,6 +52,7 @@ spec:
     registryMirrors: []
     insecureRegistries: []
     privateRegistry: ""
+    namespaceOverride: ""
     auths: # if docker add by `docker login`, if containerd append to `/etc/containerd/config.toml`
       "registry-1.docker.io":
         username : "xxx"

diff --git a/pkg/config/templates/cluster.go b/pkg/config/templates/cluster.go
@@ -17,10 +17,11 @@
 package templates
 
 import (
+	"text/template"
+
 	kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/apis/kubekey/v1alpha2"
 	"github.com/kubesphere/kubekey/pkg/core/util"
 	"github.com/lithammer/dedent"
-	"text/template"
 )
 
 // Cluster defines the template of cluster configuration file default.
@@ -62,6 +63,7 @@ spec:
   registry:
     plainHTTP: false
     privateRegistry: ""
+    namespaceOverride: ""
     registryMirrors: []
     insecureRegistries: []
   addons: []

diff --git a/pkg/images/tasks.go b/pkg/images/tasks.go
@@ -17,15 +17,16 @@
 package images
 
 import (
+	"io/ioutil"
+	"path/filepath"
+	"strings"
+
 	kubekeyv1alpha2 "github.com/kubesphere/kubekey/apis/kubekey/v1alpha2"
 	"github.com/kubesphere/kubekey/pkg/common"
 	"github.com/kubesphere/kubekey/pkg/core/connector"
 	"github.com/kubesphere/kubekey/pkg/core/logger"
 	"github.com/pkg/errors"
-	"io/ioutil"
 	versionutil "k8s.io/apimachinery/pkg/util/version"
-	"path/filepath"
-	"strings"
 )
 
 type PullImage struct {
@@ -127,6 +128,9 @@ func GetImage(runtime connector.ModuleRuntime, kubeConf *common.KubeConf, name s
 	}
 
 	image = ImageList[name]
+	if kubeConf.Cluster.Registry.NamespaceOverride != "" {
+		image.NamespaceOverride = kubeConf.Cluster.Registry.NamespaceOverride
+	}
 	return image
 }