Skip to content

Commit f6093aa

Browse files
authored
Merge pull request #3488 from marosset/43ba6c0-in-release-1-8
[release-1.8] Allow feature gates to be passed through for Windows
2 parents 6f76dd5 + d1447be commit f6093aa

17 files changed

+30
-22
lines changed

templates/test/ci/cluster-template-prow-ci-version-windows-containerd-2022.yaml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/test/ci/cluster-template-prow-ci-version.yaml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/test/ci/cluster-template-prow-intree-cloud-provider-machine-pool.yaml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/test/ci/cluster-template-prow-intree-cloud-provider.yaml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/test/ci/cluster-template-prow-machine-pool-flex.yaml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/test/ci/cluster-template-prow-machine-pool.yaml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/test/ci/cluster-template-prow.yaml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/test/ci/patches/windows-containerd-patch.yaml

Lines changed: 0 additions & 10 deletions
This file was deleted.
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
2+
kind: KubeadmControlPlane
3+
metadata:
4+
name: "${CLUSTER_NAME}-control-plane"
5+
spec:
6+
kubeadmConfigSpec:
7+
clusterConfiguration:
8+
apiServer:
9+
extraArgs:
10+
feature-gates: ${K8S_FEATURE_GATES:-""}
11+
---
12+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
13+
kind: KubeadmConfigTemplate
14+
metadata:
15+
name: ${CLUSTER_NAME}-md-win
16+
spec:
17+
template:
18+
spec:
19+
joinConfiguration:
20+
nodeRegistration:
21+
kubeletExtraArgs:
22+
feature-gates: ${NODE_FEATURE_GATES:-""}

0 commit comments

Comments
 (0)