Merge pull request #1794 from pixiake/master

update cilium chart to 1.11.7
kubesphere · Apr 6, 2023 · 6cc0f36 · 6cc0f36
2 parents 352f4df + 156f4f2
commit 6cc0f36
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 68 deletions.
diff --git a/cmd/kk/apis/kubekey/v1alpha2/default.go b/cmd/kk/apis/kubekey/v1alpha2/default.go
@@ -25,73 +25,73 @@ import (
 )
 
 const (
-	DefaultPreDir               = "kubekey"
-	DefaultTmpDir               = "/tmp/kubekey"
-	DefaultSSHPort              = 22
-	DefaultLBPort               = 6443
-	DefaultApiserverPort        = 6443
-	DefaultLBDomain             = "lb.kubesphere.local"
-	DefaultNetworkPlugin        = "calico"
-	DefaultPodsCIDR             = "10.233.64.0/18"
-	DefaultServiceCIDR          = "10.233.0.0/18"
-	DefaultKubeImageNamespace   = "kubesphere"
-	DefaultClusterName          = "cluster.local"
-	DefaultDNSDomain            = "cluster.local"
-	DefaultArch                 = "amd64"
-	DefaultSSHTimeout           = 30
-	DefaultEtcdVersion          = "v3.4.13"
-	DefaultEtcdPort             = "2379"
-	DefaultDockerVersion        = "20.10.8"
-	DefaultContainerdVersion    = "1.6.4"
-	DefaultRuncVersion          = "v1.1.1"
-	DefaultCrictlVersion        = "v1.24.0"
-	DefaultKubeVersion          = "v1.23.10"
-	DefaultCalicoVersion        = "v3.23.2"
-	DefaultFlannelVersion       = "v0.21.3"
-	DefaultFlannelCniPluginVersion  = "v1.1.2"
-	DefaultCniVersion           = "v1.2.0"
-	DefaultCiliumVersion        = "v1.11.6"
-	DefaultKubeovnVersion       = "v1.10.6"
-	DefalutMultusVersion        = "v3.8"
-	DefaultHelmVersion          = "v3.9.0"
-	DefaultDockerComposeVersion = "v2.2.2"
-	DefaultRegistryVersion      = "2"
-	DefaultHarborVersion        = "v2.5.3"
-	DefaultMaxPods              = 110
-	DefaultPodPidsLimit         = 10000
-	DefaultNodeCidrMaskSize     = 24
-	DefaultIPIPMode             = "Always"
-	DefaultVXLANMode            = "Never"
-	DefaultVethMTU              = 0
-	DefaultBackendMode          = "vxlan"
-	DefaultProxyMode            = "ipvs"
-	DefaultCrioEndpoint         = "unix:///var/run/crio/crio.sock"
-	DefaultContainerdEndpoint   = "unix:///run/containerd/containerd.sock"
-	DefaultIsulaEndpoint        = "unix:///var/run/isulad.sock"
-	Etcd                        = "etcd"
-	Master                      = "master"
-	ControlPlane                = "control-plane"
-	Worker                      = "worker"
-	K8s                         = "k8s"
-	Registry                    = "registry"
-	DefaultEtcdBackupDir        = "/var/backups/kube_etcd"
-	DefaultEtcdBackupPeriod     = 1440
-	DefaultKeepBackNumber       = 5
-	DefaultEtcdBackupScriptDir  = "/usr/local/bin/kube-scripts"
-	DefaultPodGateway           = "10.233.64.1"
-	DefaultJoinCIDR             = "100.64.0.0/16"
-	DefaultNetworkType          = "geneve"
-	DefaultTunnelType           = "geneve"
-	DefaultPodNicType           = "veth-pair"
-	DefaultModules              = "kube_ovn_fastpath.ko"
-	DefaultRPMs                 = "openvswitch-kmod"
-	DefaultVlanID               = "100"
-	DefaultOvnLabel             = "node-role.kubernetes.io/control-plane"
-	DefaultDPDKVersion          = "19.11"
-	DefaultDNSAddress           = "114.114.114.114"
-	DefaultDpdkTunnelIface      = "br-phy"
-	DefaultCNIConfigPriority    = "01"
-	DefaultOpenEBSBasePath      = "/var/openebs/local"
+	DefaultPreDir                  = "kubekey"
+	DefaultTmpDir                  = "/tmp/kubekey"
+	DefaultSSHPort                 = 22
+	DefaultLBPort                  = 6443
+	DefaultApiserverPort           = 6443
+	DefaultLBDomain                = "lb.kubesphere.local"
+	DefaultNetworkPlugin           = "calico"
+	DefaultPodsCIDR                = "10.233.64.0/18"
+	DefaultServiceCIDR             = "10.233.0.0/18"
+	DefaultKubeImageNamespace      = "kubesphere"
+	DefaultClusterName             = "cluster.local"
+	DefaultDNSDomain               = "cluster.local"
+	DefaultArch                    = "amd64"
+	DefaultSSHTimeout              = 30
+	DefaultEtcdVersion             = "v3.4.13"
+	DefaultEtcdPort                = "2379"
+	DefaultDockerVersion           = "20.10.8"
+	DefaultContainerdVersion       = "1.6.4"
+	DefaultRuncVersion             = "v1.1.1"
+	DefaultCrictlVersion           = "v1.24.0"
+	DefaultKubeVersion             = "v1.23.10"
+	DefaultCalicoVersion           = "v3.23.2"
+	DefaultFlannelVersion          = "v0.21.3"
+	DefaultFlannelCniPluginVersion = "v1.1.2"
+	DefaultCniVersion              = "v1.2.0"
+	DefaultCiliumVersion           = "v1.11.6"
+	DefaultKubeovnVersion          = "v1.10.6"
+	DefalutMultusVersion           = "v3.8"
+	DefaultHelmVersion             = "v3.9.0"
+	DefaultDockerComposeVersion    = "v2.2.2"
+	DefaultRegistryVersion         = "2"
+	DefaultHarborVersion           = "v2.5.3"
+	DefaultMaxPods                 = 110
+	DefaultPodPidsLimit            = 10000
+	DefaultNodeCidrMaskSize        = 24
+	DefaultIPIPMode                = "Always"
+	DefaultVXLANMode               = "Never"
+	DefaultVethMTU                 = 0
+	DefaultBackendMode             = "vxlan"
+	DefaultProxyMode               = "ipvs"
+	DefaultCrioEndpoint            = "unix:///var/run/crio/crio.sock"
+	DefaultContainerdEndpoint      = "unix:///run/containerd/containerd.sock"
+	DefaultIsulaEndpoint           = "unix:///var/run/isulad.sock"
+	Etcd                           = "etcd"
+	Master                         = "master"
+	ControlPlane                   = "control-plane"
+	Worker                         = "worker"
+	K8s                            = "k8s"
+	Registry                       = "registry"
+	DefaultEtcdBackupDir           = "/var/backups/kube_etcd"
+	DefaultEtcdBackupPeriod        = 1440
+	DefaultKeepBackNumber          = 5
+	DefaultEtcdBackupScriptDir     = "/usr/local/bin/kube-scripts"
+	DefaultPodGateway              = "10.233.64.1"
+	DefaultJoinCIDR                = "100.64.0.0/16"
+	DefaultNetworkType             = "geneve"
+	DefaultTunnelType              = "geneve"
+	DefaultPodNicType              = "veth-pair"
+	DefaultModules                 = "kube_ovn_fastpath.ko"
+	DefaultRPMs                    = "openvswitch-kmod"
+	DefaultVlanID                  = "100"
+	DefaultOvnLabel                = "node-role.kubernetes.io/control-plane"
+	DefaultDPDKVersion             = "19.11"
+	DefaultDNSAddress              = "114.114.114.114"
+	DefaultDpdkTunnelIface         = "br-phy"
+	DefaultCNIConfigPriority       = "01"
+	DefaultOpenEBSBasePath         = "/var/openebs/local"
 
 	Docker     = "docker"
 	Conatinerd = "containerd"

diff --git a/cmd/kk/pkg/plugins/network/cilium-1.11.6.tgz b/cmd/kk/pkg/plugins/network/cilium-1.11.6.tgz
diff --git a/cmd/kk/pkg/plugins/network/cilium-1.11.7.tgz b/cmd/kk/pkg/plugins/network/cilium-1.11.7.tgz
diff --git a/cmd/kk/pkg/plugins/network/tasks.go b/cmd/kk/pkg/plugins/network/tasks.go
@@ -34,7 +34,7 @@ import (
 	"github.com/kubesphere/kubekey/v3/cmd/kk/pkg/plugins/network/templates"
 )
 
-//go:embed cilium-1.11.6.tgz
+//go:embed cilium-1.11.7.tgz
 
 var f embed.FS