added streaming server addr configuration for cri-dockerd

rancher · Aug 22, 2024 · 85b8385 · 85b8385
1 parent 2e0a4a7
commit 85b8385
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/cluster/plan.go b/cluster/plan.go
@@ -66,6 +66,8 @@ const (
 
 	KubeletCRIDockerdNameEnv = "RKE_KUBELET_CRIDOCKERD"
 	KubeletDualStackNameEnv  = "RKE_KUBELET_CRIDOCKERD_DUALSTACK"
+	StreamServerAddressEnv   = "STREAM_SERVER_ADDRESS"
+	StreamServerPortEnv      = "STREAM_SERVER_PORT"
 )
 
 var (
@@ -617,7 +619,9 @@ func (c *Cluster) BuildKubeletProcess(host *hosts.Host, serviceOptions v3.Kubern
 	if c.IsCRIDockerdEnabled() {
 		Env = append(Env,
 			// Enable running cri-dockerd
-			fmt.Sprintf("%s=%s", KubeletCRIDockerdNameEnv, "true"))
+			fmt.Sprintf("%s=%s", KubeletCRIDockerdNameEnv, "true"),
+			fmt.Sprintf("%s=%s", StreamServerAddressEnv, c.StreamServerAddress),
+			fmt.Sprintf("%s=%s", StreamServerPortEnv, c.StreamServerPort))
 		if c.multipleCIDRsConfigured() {
 			Env = append(Env,
 				// Enable cri-dockerd flag for dual-stack

diff --git a/types/rke_types.go b/types/rke_types.go
@@ -65,6 +65,10 @@ type RancherKubernetesEngineConfig struct {
 	DNS *DNSConfig `yaml:"dns" json:"dns,omitempty"`
 	// Upgrade Strategy for the cluster
 	UpgradeStrategy *NodeUpgradeStrategy `yaml:"upgrade_strategy,omitempty" json:"upgradeStrategy,omitempty"`
+	// Stream Server Address for cri-dockerd
+	StreamServerAddress string `yaml:"stream_server_address" json:"streamServerAddress,omitempty"`
+	// Stream Server Port for cri-dockerd
+	StreamServerPort string `yaml:"stream_server_port" json:"streamServerPort,omitempty"`
 }
 
 func (r *RancherKubernetesEngineConfig) ObjClusterName() string {