Skip to content
This repository has been archived by the owner on Oct 24, 2023. It is now read-only.

chore: don't refer to hyperkube in template if > 1.16 #2676

Merged
merged 2 commits into from
Feb 4, 2020
Merged

chore: don't refer to hyperkube in template if > 1.16 #2676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b6fa72
chore: don't refer to hyperkube in template if > 1.16
jackfrancis Feb 3, 2020
d802818
fix: need params
jackfrancis Feb 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions parts/k8s/cloud-init/masternodecustomdata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,9 @@ MASTER_CONTAINER_ADDONS_PLACEHOLDER
owner: root
content: |
KUBELET_CONFIG={{GetKubeletConfigKeyVals .MasterProfile.KubernetesConfig}}
{{- if not (IsKubernetesVersionGe "1.17.0")}}
KUBELET_IMAGE={{GetHyperkubeImageReference}}
{{end}}
{{if IsKubernetesVersionGe "1.16.0"}}
KUBELET_NODE_LABELS={{GetMasterKubernetesLabels "',variables('labelResourceGroup'),'"}}
{{else}}
Expand Down
4 changes: 3 additions & 1 deletion parts/k8s/cloud-init/nodecustomdata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,8 +306,10 @@ write_files:
owner: root
content: |
KUBELET_CONFIG={{GetKubeletConfigKeyVals .KubernetesConfig }}
KUBELET_IMAGE={{GetHyperkubeImageReference}}
KUBELET_REGISTER_SCHEDULABLE=true
{{- if not (IsKubernetesVersionGe "1.17.0")}}
KUBELET_IMAGE={{GetHyperkubeImageReference}}
{{end}}
{{if IsKubernetesVersionGe "1.16.0"}}
KUBELET_NODE_LABELS={{GetAgentKubernetesLabels . "',variables('labelResourceGroup'),'"}}
{{else}}
Expand Down
6 changes: 5 additions & 1 deletion pkg/engine/templates_generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.