Skip to content

Commit a660228

Browse files
committed
fix KubeadmConfig patches for DRA templates
1 parent e591f24 commit a660228

File tree

5 files changed

+29
-7
lines changed

5 files changed

+29
-7
lines changed

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

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

templates/test/ci/patches/dra-kubeadmconfigtemplate.yaml renamed to templates/test/ci/patches/dra-kubeadmconfig.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
- op: add
2-
path: /spec/template/spec/files/-
2+
path: /spec/files/-
33
value:
44
content: |
55
#!/bin/bash
@@ -11,8 +11,8 @@
1111
path: /tmp/containerd-config.sh
1212
permissions: "0744"
1313
- op: add
14-
path: /spec/template/spec/preKubeadmCommands/0
14+
path: /spec/preKubeadmCommands/0
1515
value: bash -c /tmp/containerd-config.sh
1616
- op: add
17-
path: /spec/template/spec/joinConfiguration/nodeRegistration/kubeletExtraArgs/feature-gates
17+
path: /spec/joinConfiguration/nodeRegistration/kubeletExtraArgs/feature-gates
1818
value: ${NODE_FEATURE_GATES:-"DynamicResourceAllocation=true"}

templates/test/ci/prow-ci-version-dra/kustomization.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ patches:
1010
- path: ../patches/dra-kubeadmcontrolplane.yaml
1111
target:
1212
kind: KubeadmControlPlane
13-
- path: ../patches/dra-kubeadmconfigtemplate.yaml
13+
- path: ../patches/dra-kubeadmconfig.yaml
1414
target:
15-
kind: KubeadmConfigTemplate
15+
kind: KubeadmConfig
1616

1717
sortOptions:
1818
order: fifo

templates/test/dev/cluster-template-custom-builds-dra.yaml

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

templates/test/dev/custom-builds-dra/kustomization.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ patches:
1010
- path: ../../ci/patches/dra-kubeadmcontrolplane.yaml
1111
target:
1212
kind: KubeadmControlPlane
13-
- path: ../../ci/patches/dra-kubeadmconfigtemplate.yaml
13+
- path: ../../ci/patches/dra-kubeadmconfig.yaml
1414
target:
15-
kind: KubeadmConfigTemplate
15+
kind: KubeadmConfig
1616

1717
sortOptions:
1818
order: fifo

0 commit comments

Comments
 (0)