Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2024-10-01 01:36:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix qemu initialization

Browse Source
This commit is contained in:
Leonard Cohnen 2022-09-02 20:19:20 +02:00 committed by 3u13r
parent a09c53a700
commit 7b00005ed6
3 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bootstrapper/internal/kubernetes/k8sapi/util.go
View File

@ -239,7 +239,7 @@ func (k *KubernetesUtil) deployCilium(ctx context.Context, in SetupPodNetworkInp
case "azure": case "azure":
return k.deployCiliumAzure(ctx, helmClient, ciliumDeployment, in.LoadBalancerEndpoint) return k.deployCiliumAzure(ctx, helmClient, ciliumDeployment, in.LoadBalancerEndpoint)
case "qemu": case "qemu":
return k.deployCiliumQEMU(ctx, helmClient, ciliumDeployment, in.SubnetworkPodCIDR) return k.deployCiliumQEMU(ctx, helmClient, ciliumDeployment, in.SubnetworkPodCIDR, in.LoadBalancerEndpoint)
default: default:
return fmt.Errorf("unsupported cloud provider %q", in.CloudProvider) return fmt.Errorf("unsupported cloud provider %q", in.CloudProvider)
} }
@ -347,7 +347,7 @@ func (k *KubernetesUtil) FixCilium(nodeNameK8s string, log *logger.Logger) {
} }
} }
func (k *KubernetesUtil) deployCiliumQEMU(ctx context.Context, helmClient *action.Install, ciliumDeployment helm.Deployment, subnetworkPodCIDR string) error { func (k *KubernetesUtil) deployCiliumQEMU(ctx context.Context, helmClient *action.Install, ciliumDeployment helm.Deployment, subnetworkPodCIDR, kubeAPIEndpoint string) error {
// configure pod network CIDR // configure pod network CIDR
ciliumDeployment.Values["ipam"] = map[string]interface{}{ ciliumDeployment.Values["ipam"] = map[string]interface{}{
"operator": map[string]interface{}{ "operator": map[string]interface{}{
@ -357,6 +357,9 @@ func (k *KubernetesUtil) deployCiliumQEMU(ctx context.Context, helmClient *actio
}, },
} }
ciliumDeployment.Values["k8sServiceHost"] = kubeAPIEndpoint
ciliumDeployment.Values["k8sServicePort"] = strconv.Itoa(constants.KubernetesPort)
_, err := helmClient.RunWithContext(ctx, ciliumDeployment.Chart, ciliumDeployment.Values) _, err := helmClient.RunWithContext(ctx, ciliumDeployment.Chart, ciliumDeployment.Values)
if err != nil { if err != nil {
return fmt.Errorf("installing cilium: %w", err) return fmt.Errorf("installing cilium: %w", err)

2
bootstrapper/internal/kubernetes/kubernetes.go
View File

@ -262,11 +262,13 @@ func (k *KubeWrapper) JoinCluster(ctx context.Context, args *kubeadm.BootstrapTo
providerID = instance.ProviderID providerID = instance.ProviderID
nodeName = instance.Name nodeName = instance.Name
nodeInternalIP = instance.VPCIP nodeInternalIP = instance.VPCIP
if k.providerMetadata.SupportsLoadBalancer() {
loadbalancerEndpoint, err = k.providerMetadata.GetLoadBalancerEndpoint(ctx) loadbalancerEndpoint, err = k.providerMetadata.GetLoadBalancerEndpoint(ctx)
if err != nil { if err != nil {
return fmt.Errorf("retrieving loadbalancer endpoint: %w", err) return fmt.Errorf("retrieving loadbalancer endpoint: %w", err)
} }
} }
}
nodeName = k8sCompliantHostname(nodeName) nodeName = k8sCompliantHostname(nodeName)
log.With( log.With(

19
cli/internal/helm/values.go
View File

@ -88,5 +88,24 @@ var qemuVals = map[string]interface{}{
"enabled": true, "enabled": true,
"type": "wireguard", "type": "wireguard",
}, },
"image": map[string]interface{}{
"repository": "ghcr.io/3u13r/cilium",
"suffix": "",
"tag": "v1.12.1-edg",
"digest": "sha256:fdac430143fe719331698b76fbe66410631a21afd3405407d56db260d2d6999b",
"useDigest": true,
},
"operator": map[string]interface{}{
"image": map[string]interface{}{
"repository": "ghcr.io/3u13r/operator",
"suffix": "",
"tag": "v1.12.1-edg",
"genericDigest": "sha256:a225d8d3976fd2a05cfa0c929cd32e60283abedf6bae51db4709df19b2fb70cb",
"useDigest": true,
},
},
"kubeProxyReplacement": "strict",
"enableCiliumEndpointSlice": true,
"kubeProxyReplacementHealthzBindAddr": "0.0.0.0:10256",
"l7Proxy": false, "l7Proxy": false,
} }