Skip to content

Commit

Permalink
kubeadm: support feature_gates
Browse files Browse the repository at this point in the history
  • Loading branch information
karmab committed Feb 10, 2025
1 parent 9fb3318 commit 58d3271
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
3 changes: 3 additions & 0 deletions kvirt/cluster/kubeadm/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,9 @@ def create(config, plandir, cluster, overrides):
insecure=True, cmd=urlcmd, vmport=disconnected_vmport)
disconnected_url = os.popen(urlcmd).read().strip()
data['disconnected_url'] = disconnected_url
feature_gates = data['feature_gates']
if feature_gates:
data['feature_gates'] = [f"{feature_gate}=true" for feature_gate in feature_gates]
result = config.plan(plan, inputfile=f'{plandir}/bootstrap.yml', overrides=data)
if result['result'] != "success":
return result
Expand Down
3 changes: 2 additions & 1 deletion kvirt/cluster/kubeadm/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ CERTKEY={{ cert_key }}
TOKEN={{ token }}
K8S_VERSION='{{ "--kubernetes-version %s" % minor_version if minor_version is defined else "" }}'
REGISTRY='{{ "--image-repository %s" % disconnected_url if disconnected_url != None else "" }}'
kubeadm init --control-plane-endpoint "${API_IP}:6443" --pod-network-cidr $POD_CIDR --service-cidr $SERVICE_CIDR --certificate-key $CERTKEY --upload-certs --token $TOKEN --token-ttl 0 --apiserver-cert-extra-sans ${API_IP} $K8S_VERSION $REGISTRY
FEATUREGATES='{{ "--feature-gates %s" % ','.join(feature_gates) if feature_gates else "" }}'
kubeadm init --control-plane-endpoint "${API_IP}:6443" --pod-network-cidr $POD_CIDR --service-cidr $SERVICE_CIDR --certificate-key $CERTKEY --upload-certs --token $TOKEN --token-ttl 0 --apiserver-cert-extra-sans ${API_IP} $K8S_VERSION $REGISTRY $FEATUREGATES

# config cluster credentials
cp /etc/kubernetes/admin.conf /root/kubeconfig
Expand Down
1 change: 1 addition & 0 deletions kvirt/cluster/kubeadm/kcli_default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,4 @@ disconnected_url:
disconnected_user: dummy
disconnected_password: dummy
disconnected_sync: true
feature_gates: []

0 comments on commit 58d3271

Please sign in to comment.