Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-05-02 06:16:08 -04:00
Code Issues Projects Releases Packages Wiki Activity

AB#2077: add v1.24.3 support (#298)

Browse source 
This is a squashed commit. 
* Necessary changes for 1.24 support. Trigger join-service build.
* Update joinservice version. Image was created 
by manually triggered workflow, based on now squashed commit.

microservice-demo can be deployed successfully.
No errors during cluster setup.
This commit is contained in:
Otto Bittner 2022-07-26 17:08:57 +02:00 • committed by GitHub
parent ff5100f332
commit 83d2c7b6a3
6 changed files with 32 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
bootstrapper/internal/kubernetes/k8sapi/kubeadm_config.go
View file

@ -38,10 +38,9 @@ func (c *CoreOSConfiguration) InitConfiguration(externalCloudProvider bool, k8sV
Kind: "InitConfiguration",
},
NodeRegistration: kubeadm.NodeRegistrationOptions{
CRISocket: "/run/containerd/containerd.sock",
CRISocket: "unix:///run/containerd/containerd.sock",
KubeletExtraArgs: map[string]string{
"cloud-provider": cloudProvider,
"network-plugin": "cni",
},
},
// AdvertiseAddress will be overwritten later
@ -162,7 +161,7 @@ func (c *CoreOSConfiguration) JoinConfiguration(externalCloudProvider bool) Kube
Kind: "JoinConfiguration",
},
NodeRegistration: kubeadm.NodeRegistrationOptions{
CRISocket: "/run/containerd/containerd.sock",
CRISocket: "unix:///run/containerd/containerd.sock",
KubeletExtraArgs: map[string]string{
"cloud-provider": cloudProvider,
},