add system-default-registry setting (#132)

nasusoba · qi liang · web-flow · commit 661bbbe59a7b · 2024-06-17T13:53:00.000+08:00
Signed-off-by: nasusoba &lt;zhengrunyu2020@outlook.com&gt;

fix conversion

Co-authored-by: qi liang &lt;qliang@microsoft.com&gt;
diff --git a/bootstrap/api/v1beta1/conversion.go b/bootstrap/api/v1beta1/conversion.go
@@ -42,6 +42,7 @@ func (c *KThreesConfig) ConvertTo(dstRaw ctrlconversion.Hub) error {
 	dst.Spec.ServerConfig.CloudProviderName = restored.Spec.ServerConfig.CloudProviderName
 	dst.Spec.ServerConfig.DeprecatedDisableExternalCloudProvider = restored.Spec.ServerConfig.DeprecatedDisableExternalCloudProvider
 	dst.Spec.ServerConfig.DisableCloudController = restored.Spec.ServerConfig.DisableCloudController
+	dst.Spec.ServerConfig.SystemDefaultRegistry = restored.Spec.ServerConfig.SystemDefaultRegistry
 	return nil
 }
 
@@ -94,6 +95,7 @@ func (r *KThreesConfigTemplate) ConvertTo(dstRaw ctrlconversion.Hub) error {
 	dst.Spec.Template.Spec.ServerConfig.CloudProviderName = restored.Spec.Template.Spec.ServerConfig.CloudProviderName
 	dst.Spec.Template.Spec.ServerConfig.DeprecatedDisableExternalCloudProvider = restored.Spec.Template.Spec.ServerConfig.DeprecatedDisableExternalCloudProvider
 	dst.Spec.Template.Spec.ServerConfig.DisableCloudController = restored.Spec.Template.Spec.ServerConfig.DisableCloudController
+	dst.Spec.Template.Spec.ServerConfig.SystemDefaultRegistry = restored.Spec.Template.Spec.ServerConfig.SystemDefaultRegistry
 	return nil
 }
 
diff --git a/bootstrap/api/v1beta1/zz_generated.conversion.go b/bootstrap/api/v1beta1/zz_generated.conversion.go
diff --git a/bootstrap/api/v1beta2/kthreesconfig_types.go b/bootstrap/api/v1beta2/kthreesconfig_types.go
@@ -120,6 +120,10 @@ type KThreesServerConfig struct {
 	// CloudProviderName defines the --cloud-provider= kubelet extra arg. (default: "external")
 	// +optional
 	CloudProviderName *string `json:"cloudProviderName,omitempty"`
+
+	// SystemDefaultRegistry defines private registry to be used for all system images
+	// +optional
+	SystemDefaultRegistry string `json:"systemDefaultRegistry,omitempty"`
 }
 
 type KThreesAgentConfig struct {
diff --git a/bootstrap/config/crd/bases/bootstrap.cluster.x-k8s.io_kthreesconfigs.yaml b/bootstrap/config/crd/bases/bootstrap.cluster.x-k8s.io_kthreesconfigs.yaml
@@ -496,6 +496,10 @@ spec:
                     description: 'ServiceCidr Network CIDR to use for services IPs
                       (default: "10.43.0.0/16")'
                     type: string
+                  systemDefaultRegistry:
+                    description: SystemDefaultRegistry defines private registry to
+                      be used for all system images
+                    type: string
                   tlsSan:
                     description: TLSSan Add additional hostname or IP as a Subject
                       Alternative Name in the TLS cert
diff --git a/bootstrap/config/crd/bases/bootstrap.cluster.x-k8s.io_kthreesconfigtemplates.yaml b/bootstrap/config/crd/bases/bootstrap.cluster.x-k8s.io_kthreesconfigtemplates.yaml
@@ -458,6 +458,10 @@ spec:
                             description: 'ServiceCidr Network CIDR to use for services
                               IPs (default: "10.43.0.0/16")'
                             type: string
+                          systemDefaultRegistry:
+                            description: SystemDefaultRegistry defines private registry
+                              to be used for all system images
+                            type: string
                           tlsSan:
                             description: TLSSan Add additional hostname or IP as a
                               Subject Alternative Name in the TLS cert
diff --git a/controlplane/api/v1beta1/conversion.go b/controlplane/api/v1beta1/conversion.go
@@ -93,6 +93,7 @@ func (in *KThreesControlPlane) ConvertTo(dstRaw ctrlconversion.Hub) error {
 	dst.Spec.KThreesConfigSpec.ServerConfig.CloudProviderName = restored.Spec.KThreesConfigSpec.ServerConfig.CloudProviderName
 	dst.Spec.KThreesConfigSpec.ServerConfig.DeprecatedDisableExternalCloudProvider = restored.Spec.KThreesConfigSpec.ServerConfig.DeprecatedDisableExternalCloudProvider
 	dst.Spec.KThreesConfigSpec.ServerConfig.DisableCloudController = restored.Spec.KThreesConfigSpec.ServerConfig.DisableCloudController
+	dst.Spec.KThreesConfigSpec.ServerConfig.SystemDefaultRegistry = restored.Spec.KThreesConfigSpec.ServerConfig.SystemDefaultRegistry
 	dst.Spec.MachineTemplate.NodeVolumeDetachTimeout = restored.Spec.MachineTemplate.NodeVolumeDetachTimeout
 	dst.Spec.MachineTemplate.NodeDeletionTimeout = restored.Spec.MachineTemplate.NodeDeletionTimeout
 	dst.Status.Version = restored.Status.Version
diff --git a/controlplane/config/crd/bases/controlplane.cluster.x-k8s.io_kthreescontrolplanes.yaml b/controlplane/config/crd/bases/controlplane.cluster.x-k8s.io_kthreescontrolplanes.yaml
@@ -804,6 +804,10 @@ spec:
                         description: 'ServiceCidr Network CIDR to use for services
                           IPs (default: "10.43.0.0/16")'
                         type: string
+                      systemDefaultRegistry:
+                        description: SystemDefaultRegistry defines private registry
+                          to be used for all system images
+                        type: string
                       tlsSan:
                         description: TLSSan Add additional hostname or IP as a Subject
                           Alternative Name in the TLS cert
diff --git a/controlplane/config/crd/bases/controlplane.cluster.x-k8s.io_kthreescontrolplanetemplates.yaml b/controlplane/config/crd/bases/controlplane.cluster.x-k8s.io_kthreescontrolplanetemplates.yaml
@@ -244,6 +244,10 @@ spec:
                                 description: 'ServiceCidr Network CIDR to use for
                                   services IPs (default: "10.43.0.0/16")'
                                 type: string
+                              systemDefaultRegistry:
+                                description: SystemDefaultRegistry defines private
+                                  registry to be used for all system images
+                                type: string
                               tlsSan:
                                 description: TLSSan Add additional hostname or IP
                                   as a Subject Alternative Name in the TLS cert
diff --git a/pkg/k3s/config.go b/pkg/k3s/config.go
@@ -25,6 +25,7 @@ type K3sServerConfig struct {
 	ClusterDomain             string   `json:"cluster-domain,omitempty"`
 	DisableComponents         []string `json:"disable,omitempty"`
 	ClusterInit               bool     `json:"cluster-init,omitempty"`
+	SystemDefaultRegistry     string   `json:"system-default-registry,omitempty"`
 	K3sAgentConfig            `json:",inline"`
 }
 
@@ -57,6 +58,7 @@ func GenerateInitControlPlaneConfig(controlPlaneEndpoint string, token string, s
 		ClusterDNS:                serverConfig.ClusterDNS,
 		ClusterDomain:             serverConfig.ClusterDomain,
 		DisableComponents:         serverConfig.DisableComponents,
+		SystemDefaultRegistry:     serverConfig.SystemDefaultRegistry,
 	}
 
 	k3sServerConfig.K3sAgentConfig = K3sAgentConfig{
@@ -89,6 +91,7 @@ func GenerateJoinControlPlaneConfig(serverURL string, token string, controlplane
 		ClusterDNS:                serverConfig.ClusterDNS,
 		ClusterDomain:             serverConfig.ClusterDomain,
 		DisableComponents:         serverConfig.DisableComponents,
+		SystemDefaultRegistry:     serverConfig.SystemDefaultRegistry,
 	}
 
 	k3sServerConfig.K3sAgentConfig = K3sAgentConfig{

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ func (c *KThreesConfig) ConvertTo(dstRaw ctrlconversion.Hub) error {`
`42`	`42`	`dst.Spec.ServerConfig.CloudProviderName = restored.Spec.ServerConfig.CloudProviderName`
`43`	`43`	`dst.Spec.ServerConfig.DeprecatedDisableExternalCloudProvider = restored.Spec.ServerConfig.DeprecatedDisableExternalCloudProvider`
`44`	`44`	`dst.Spec.ServerConfig.DisableCloudController = restored.Spec.ServerConfig.DisableCloudController`
	`45`	`+ dst.Spec.ServerConfig.SystemDefaultRegistry = restored.Spec.ServerConfig.SystemDefaultRegistry`
`45`	`46`	`return nil`
`46`	`47`	`}`
`47`	`48`
`@@ -94,6 +95,7 @@ func (r *KThreesConfigTemplate) ConvertTo(dstRaw ctrlconversion.Hub) error {`
`94`	`95`	`dst.Spec.Template.Spec.ServerConfig.CloudProviderName = restored.Spec.Template.Spec.ServerConfig.CloudProviderName`
`95`	`96`	`dst.Spec.Template.Spec.ServerConfig.DeprecatedDisableExternalCloudProvider = restored.Spec.Template.Spec.ServerConfig.DeprecatedDisableExternalCloudProvider`
`96`	`97`	`dst.Spec.Template.Spec.ServerConfig.DisableCloudController = restored.Spec.Template.Spec.ServerConfig.DisableCloudController`
	`98`	`+ dst.Spec.Template.Spec.ServerConfig.SystemDefaultRegistry = restored.Spec.Template.Spec.ServerConfig.SystemDefaultRegistry`
`97`	`99`	`return nil`
`98`	`100`	`}`
`99`	`101`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ type K3sServerConfig struct {`
`25`	`25`	ClusterDomain string `json:"cluster-domain,omitempty"`
`26`	`26`	DisableComponents []string `json:"disable,omitempty"`
`27`	`27`	ClusterInit bool `json:"cluster-init,omitempty"`
	`28`	+ SystemDefaultRegistry string `json:"system-default-registry,omitempty"`
`28`	`29`	K3sAgentConfig `json:",inline"`
`29`	`30`	`}`
`30`	`31`
`@@ -57,6 +58,7 @@ func GenerateInitControlPlaneConfig(controlPlaneEndpoint string, token string, s`
`57`	`58`	`ClusterDNS: serverConfig.ClusterDNS,`
`58`	`59`	`ClusterDomain: serverConfig.ClusterDomain,`
`59`	`60`	`DisableComponents: serverConfig.DisableComponents,`
	`61`	`+ SystemDefaultRegistry: serverConfig.SystemDefaultRegistry,`
`60`	`62`	`}`
`61`	`63`
`62`	`64`	`k3sServerConfig.K3sAgentConfig = K3sAgentConfig{`
`@@ -89,6 +91,7 @@ func GenerateJoinControlPlaneConfig(serverURL string, token string, controlplane`
`89`	`91`	`ClusterDNS: serverConfig.ClusterDNS,`
`90`	`92`	`ClusterDomain: serverConfig.ClusterDomain,`
`91`	`93`	`DisableComponents: serverConfig.DisableComponents,`
	`94`	`+ SystemDefaultRegistry: serverConfig.SystemDefaultRegistry,`
`92`	`95`	`}`
`93`	`96`
`94`	`97`	`k3sServerConfig.K3sAgentConfig = K3sAgentConfig{`