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

Make Kubernetes serviceCIDR configurable in config (#2660)

Browse source 
* config: pass serviceCIDR to kubeadm init

* terraform: add serviceCIDR
This commit is contained in:
3u13r 2023-12-01 14:39:05 +01:00 • committed by GitHub
parent c2d1a7b7fb
commit 63cdd03d09
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 103 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

3
bootstrapper/internal/kubernetes/kubernetes.go
View file

@ -69,7 +69,7 @@ func New(cloudProvider string, clusterUtil clusterUtil, configProvider configura
// InitCluster initializes a new Kubernetes cluster and applies pod network provider.
func (k *KubeWrapper) InitCluster(
ctx context.Context, versionString, clusterName string, conformanceMode bool, kubernetesComponents components.Components, apiServerCertSANs []string, log *logger.Logger,
ctx context.Context, versionString, clusterName string, conformanceMode bool, kubernetesComponents components.Components, apiServerCertSANs []string, serviceCIDR string, log *logger.Logger,
) ([]byte, error) {
log.With(zap.String("version", versionString)).Infof("Installing Kubernetes components")
if err := k.clusterUtil.InstallComponents(ctx, kubernetesComponents); err != nil {
@ -128,6 +128,7 @@ func (k *KubeWrapper) InitCluster(
initConfig.SetNodeName(nodeName)
initConfig.SetProviderID(instance.ProviderID)
initConfig.SetControlPlaneEndpoint(controlPlaneHost)
initConfig.SetServiceSubnet(serviceCIDR)
initConfigYAML, err := initConfig.Marshal()
if err != nil {
return nil, fmt.Errorf("encoding kubeadm init configuration as YAML: %w", err)