rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-09 11:01:40 +00:00
Code Issues Releases Wiki Activity

added streaming server addr configuration for cri-dockerd

Browse Source
This commit is contained in:
vardhaman22
2024-08-22 20:20:02 +05:30
parent 8b3b48abf5
commit 39cff368ce
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cluster/plan.go
View File

@@ -64,8 +64,10 @@ const (
EncryptionProviderConfigArgument = "encryption-provider-config" EncryptionProviderConfigArgument = "encryption-provider-config"
KubeletCRIDockerdNameEnv = "RKE_KUBELET_CRIDOCKERD" KubeletCRIDockerdNameEnv = "RKE_KUBELET_CRIDOCKERD"
KubeletDualStackNameEnv = "RKE_KUBELET_CRIDOCKERD_DUALSTACK" KubeletDualStackNameEnv = "RKE_KUBELET_CRIDOCKERD_DUALSTACK"
CRIDockerdStreamServerAddressEnv = "CRIDOCKERD_STREAM_SERVER_ADDRESS"
CRIDockerdStreamServerPortEnv = "CRIDOCKERD_STREAM_SERVER_PORT"
) )
var ( var (
@@ -618,6 +620,15 @@ func (c *Cluster) BuildKubeletProcess(host *hosts.Host, serviceOptions v3.Kubern
Env = append(Env, Env = append(Env,
// Enable running cri-dockerd // Enable running cri-dockerd
fmt.Sprintf("%s=%s", KubeletCRIDockerdNameEnv, "true")) fmt.Sprintf("%s=%s", KubeletCRIDockerdNameEnv, "true"))
if c.CRIDockerdStreamServerAddress != "" {
Env = append(Env, fmt.Sprintf("%s=%s", CRIDockerdStreamServerAddressEnv, c.CRIDockerdStreamServerAddress))
}
if c.CRIDockerdStreamServerPort != "" {
Env = append(Env, fmt.Sprintf("%s=%s", CRIDockerdStreamServerPortEnv, c.CRIDockerdStreamServerPort))
}
if c.multipleCIDRsConfigured() { if c.multipleCIDRsConfigured() {
Env = append(Env, Env = append(Env,
// Enable cri-dockerd flag for dual-stack // Enable cri-dockerd flag for dual-stack

4
types/rke_types.go
View File

@@ -65,6 +65,10 @@ type RancherKubernetesEngineConfig struct {
DNS *DNSConfig `yaml:"dns" json:"dns,omitempty"` DNS *DNSConfig `yaml:"dns" json:"dns,omitempty"`
// Upgrade Strategy for the cluster // Upgrade Strategy for the cluster
UpgradeStrategy *NodeUpgradeStrategy `yaml:"upgrade_strategy,omitempty" json:"upgradeStrategy,omitempty"` UpgradeStrategy *NodeUpgradeStrategy `yaml:"upgrade_strategy,omitempty" json:"upgradeStrategy,omitempty"`
// Stream Server Address for cri-dockerd
CRIDockerdStreamServerAddress string `yaml:"cri_dockerd_stream_server_address" json:"criDockerdStreamServerAddress,omitempty"`
// Stream Server Port for cri-dockerd
CRIDockerdStreamServerPort string `yaml:"cri_dockerd_stream_server_port" json:"criDockerdStreamServerPort,omitempty"`
} }
func (r *RancherKubernetesEngineConfig) ObjClusterName() string { func (r *RancherKubernetesEngineConfig) ObjClusterName() string {