Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Install CNI network plugins only for specific CNIs #17162

Merged
merged 6 commits into from
Jan 3, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Prev Previous commit
hack/update-expected.sh
  • Loading branch information
hakman committed Jan 3, 2025
commit 579fb6b2b07c507759c7cec00823248372e69d0c
2 changes: 1 addition & 1 deletion pkg/model/tests/data/bootstrapscript_0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
CloudProvider: aws
InstanceGroupName: testIG
InstanceGroupRole: ControlPlane
NodeupConfigHash: sq0FwAxnWal2+vIUsu8xUKK8Q+Vzx3V9LKkSFo/ds4M=
NodeupConfigHash: fAxvqbU++fBpT6SIjMMeXWlQ4oHqL/M8N7AaaJkOPOM=

__EOF_KUBE_ENV

Expand Down
2 changes: 1 addition & 1 deletion pkg/model/tests/data/bootstrapscript_1.txt
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
CloudProvider: aws
InstanceGroupName: testIG
InstanceGroupRole: ControlPlane
NodeupConfigHash: soFi0PS8cYVnHNTGuj1Fv1d8Q71M6D9Mgo/fjlPSkB0=
NodeupConfigHash: N0d3Il7CeGYFi32ZDb4i3iftzUD6swJ3F/tZf8d1bZY=

__EOF_KUBE_ENV

Expand Down
2 changes: 1 addition & 1 deletion pkg/model/tests/data/bootstrapscript_2.txt
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
CloudProvider: aws
InstanceGroupName: testIG
InstanceGroupRole: ControlPlane
NodeupConfigHash: soFi0PS8cYVnHNTGuj1Fv1d8Q71M6D9Mgo/fjlPSkB0=
NodeupConfigHash: N0d3Il7CeGYFi32ZDb4i3iftzUD6swJ3F/tZf8d1bZY=

__EOF_KUBE_ENV

Expand Down
2 changes: 1 addition & 1 deletion pkg/model/tests/data/bootstrapscript_3.txt
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
CloudProvider: aws
InstanceGroupName: testIG
InstanceGroupRole: Node
NodeupConfigHash: bzOu75vonqETQp0my4RwAbbZvfTkGmwJ0uvaN5JHI5Y=
NodeupConfigHash: X6Di6WM7EcwYaitdtxqgDgb2VjQuX4gHgLLPBZUb6Hw=

__EOF_KUBE_ENV

Expand Down
2 changes: 1 addition & 1 deletion pkg/model/tests/data/bootstrapscript_4.txt
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
CloudProvider: aws
InstanceGroupName: testIG
InstanceGroupRole: Node
NodeupConfigHash: Pj5zYnkoZ3wGhph8FTN58SH0n4LL85thsUN6YE09xe0=
NodeupConfigHash: FOtsEbu1CrMgt9fSSoK3X+UvdHnVKS4MmNRxjGmd40c=

__EOF_KUBE_ENV

Expand Down
2 changes: 1 addition & 1 deletion pkg/model/tests/data/bootstrapscript_5.txt
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
CloudProvider: aws
InstanceGroupName: testIG
InstanceGroupRole: Node
NodeupConfigHash: Pj5zYnkoZ3wGhph8FTN58SH0n4LL85thsUN6YE09xe0=
NodeupConfigHash: FOtsEbu1CrMgt9fSSoK3X+UvdHnVKS4MmNRxjGmd40c=

__EOF_KUBE_ENV

Expand Down
1 change: 1 addition & 0 deletions pkg/model/tests/data/nodeupconfig_0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Hooks:
ExecStart=/usr/bin/systemctl start apply-to-all.service
name: apply-to-all.service
- null
InstallCNIAssets: true
KeypairIDs: {}
KubeProxy:
cpuLimit: 30m
Expand Down
1 change: 1 addition & 0 deletions pkg/model/tests/data/nodeupconfig_1.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ Hooks:
- -c
- apt-get update
image: busybox
InstallCNIAssets: true
KeypairIDs: {}
KubeProxy:
cpuLimit: 30m
Expand Down
1 change: 1 addition & 0 deletions pkg/model/tests/data/nodeupconfig_2.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ Hooks:
- -c
- apt-get update
image: busybox
InstallCNIAssets: true
KeypairIDs: {}
KubeProxy:
cpuLimit: 30m
Expand Down
1 change: 1 addition & 0 deletions pkg/model/tests/data/nodeupconfig_3.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Hooks:
ExecStart=/usr/bin/systemctl start apply-to-all.service
name: apply-to-all.service
- null
InstallCNIAssets: true
KeypairIDs: {}
KubeProxy:
cpuLimit: 30m
Expand Down
1 change: 1 addition & 0 deletions pkg/model/tests/data/nodeupconfig_4.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ Hooks:
- -c
- apt-get update
image: busybox
InstallCNIAssets: true
KeypairIDs: {}
KubeProxy:
cpuLimit: 30m
Expand Down
1 change: 1 addition & 0 deletions pkg/model/tests/data/nodeupconfig_5.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ Hooks:
- -c
- apt-get update
image: busybox
InstallCNIAssets: true
KeypairIDs: {}
KubeProxy:
cpuLimit: 30m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ ClusterName: additionalobjects.example.com
ConfigBase: memfs://tests/additionalobjects.example.com
InstanceGroupName: master-us-test-1a
InstanceGroupRole: ControlPlane
NodeupConfigHash: 71EwaKyEXMn6jyRja4jekg+4R8q6vNTwr8cTxtVqeME=
NodeupConfigHash: pxwzAkxYx5nUePbonTlGaPcheFpACKvfkCfcs7IMQcM=

__EOF_KUBE_ENV

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ ConfigServer:
- https://kops-controller.internal.additionalobjects.example.com:3988/
InstanceGroupName: nodes
InstanceGroupRole: Node
NodeupConfigHash: YGAk3OvRYXlR/iugY5/3S/V4IilpYmKOqlyAv5Wdf5E=
NodeupConfigHash: AjW1WevmlRI4l09kE0iektk6rtPGAFVvXUXQkQFX0HQ=

__EOF_KUBE_ENV

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,7 @@ FileAssets:
Hooks:
- null
- null
InstallCNIAssets: true
KeypairIDs:
apiserver-aggregator-ca: "6980187172486667078076483355"
etcd-clients-ca: "6979622252718071085282986282"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ ClusterName: additionalobjects.example.com
Hooks:
- null
- null
InstallCNIAssets: true
KeypairIDs:
kubernetes-ca: "6982820025135291416230495506"
KubeProxy:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ ClusterName: minimal.example.com
ConfigBase: memfs://clusters.example.com/minimal.example.com
InstanceGroupName: apiserver
InstanceGroupRole: APIServer
NodeupConfigHash: EgxBNpdOW1dhGhWYU64WzwNDxKf3cJ7l3IhXUIpg9BM=
NodeupConfigHash: DGxbW0XRm7D5zB9YwjGlYU7alrRcRG85ySGSp39Mk1E=

__EOF_KUBE_ENV

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ ClusterName: minimal.example.com
ConfigBase: memfs://clusters.example.com/minimal.example.com
InstanceGroupName: master-us-test-1a
InstanceGroupRole: ControlPlane
NodeupConfigHash: 6I/xMbU1RuEJGM/q+HqSJhU5a4gk4fZ2NsSLom4F6ME=
NodeupConfigHash: oat4TLWZZOwj65R6CKin5eR7GMvLjjtMZK541q480iE=

__EOF_KUBE_ENV

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ ConfigServer:
- https://kops-controller.internal.minimal.example.com:3988/
InstanceGroupName: nodes
InstanceGroupRole: Node
NodeupConfigHash: kh+oYD0OsaXnRNBLafouDao8K238Z+h0NXsAYtQbdvg=
NodeupConfigHash: 2qas7IWBw7bXrVthbyjE5kxmfKcL2NufTUVsZzWlfsY=

__EOF_KUBE_ENV

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ FileAssets:
Hooks:
- null
- null
InstallCNIAssets: true
KeypairIDs:
apiserver-aggregator-ca: "6980187172486667078076483355"
etcd-clients-ca: "6979622252718071085282986282"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,7 @@ FileAssets:
Hooks:
- null
- null
InstallCNIAssets: true
KeypairIDs:
apiserver-aggregator-ca: "6980187172486667078076483355"
etcd-clients-ca: "6979622252718071085282986282"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ ClusterName: minimal.example.com
Hooks:
- null
- null
InstallCNIAssets: true
KeypairIDs:
kubernetes-ca: "6982820025135291416230495506"
KubeProxy:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ ClusterName: minimal.example.com
ConfigBase: memfs://clusters.example.com/minimal.example.com
InstanceGroupName: master-us-test-1a
InstanceGroupRole: ControlPlane
NodeupConfigHash: DN1sgfeoxwF4Qc+5F40PK2PHpduCxMyqef4Hxyn2up4=
NodeupConfigHash: 7eHYq2LK1E2ckFYz8iTZKhMiwyKE9zZ4N9Iijh0av/c=

__EOF_KUBE_ENV

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ ConfigServer:
- https://kops-controller.internal.minimal.example.com:3988/
InstanceGroupName: nodes
InstanceGroupRole: Node
NodeupConfigHash: cc2xTNBWx1xCOd/t3VrF9ED2F3kleatkRokwyNKvzNc=
NodeupConfigHash: 8CZ7yLVzS//HUyyG0tIMtQkPj8eMl/QL1MNtZRcEDDE=

__EOF_KUBE_ENV

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@ FileAssets:
Hooks:
- null
- null
InstallCNIAssets: true
KeypairIDs:
apiserver-aggregator-ca: "6980187172486667078076483355"
etcd-clients-ca: "6979622252718071085282986282"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ ClusterName: minimal.example.com
Hooks:
- null
- null
InstallCNIAssets: true
KeypairIDs:
kubernetes-ca: "6982820025135291416230495506"
KubeProxy:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ ClusterName: bastionuserdata.example.com
ConfigBase: memfs://clusters.example.com/bastionuserdata.example.com
InstanceGroupName: master-us-test-1a
InstanceGroupRole: ControlPlane
NodeupConfigHash: oawfcBRMzUOUkyGiWrmgKdLvRfQUoKcYpenNwSm2zME=
NodeupConfigHash: cFGsAAqYrwM7b8sg8ARyUvrQ/X1mCS1wq1IuxNHlcbE=

__EOF_KUBE_ENV

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ ConfigServer:
- https://kops-controller.internal.bastionuserdata.example.com:3988/
InstanceGroupName: nodes
InstanceGroupRole: Node
NodeupConfigHash: ksGASsz+Zd4bN3mRrF+LFw2mlGOwJ4GHA6dhJ91ePzc=
NodeupConfigHash: GBq6HoXAbWL91+sbYN2UBHutnOTPqZ4YF4eubbNjGsk=

__EOF_KUBE_ENV

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ ClusterName: bastionuserdata.example.com
Hooks:
- null
- null
InstallCNIAssets: true
KeypairIDs: {}
KubeProxy:
clusterCIDR: 100.96.0.0/11
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,7 @@ FileAssets:
Hooks:
- null
- null
InstallCNIAssets: true
KeypairIDs:
apiserver-aggregator-ca: "6980187172486667078076483355"
etcd-clients-ca: "6979622252718071085282986282"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ ClusterName: bastionuserdata.example.com
Hooks:
- null
- null
InstallCNIAssets: true
KeypairIDs:
kubernetes-ca: "6982820025135291416230495506"
KubeProxy:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ ClusterName: cas-priority-expander-custom.example.com
ConfigBase: memfs://clusters.example.com/cas-priority-expander-custom.example.com
InstanceGroupName: master-us-test-1a
InstanceGroupRole: ControlPlane
NodeupConfigHash: s+rdLO6YzM5pXSZzp0Awd+0u3DxouvE0BNN4jFRJQPA=
NodeupConfigHash: b2xNUpnVA9+OHxycc5ZxoOaYX0WauMvhVCZbOHYhWSg=

__EOF_KUBE_ENV

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ ConfigServer:
- https://kops-controller.internal.cas-priority-expander-custom.example.com:3988/
InstanceGroupName: nodes-high-priority
InstanceGroupRole: Node
NodeupConfigHash: C/lz8xS7S7VH2aQEg3hW1XudOlJsrjQZMIVcb+B/dfM=
NodeupConfigHash: 3S0kO0rn8/IeZUrZftL7DVYj+3R6xDMIb4Ntoz8LYwI=

__EOF_KUBE_ENV

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ ConfigServer:
- https://kops-controller.internal.cas-priority-expander-custom.example.com:3988/
InstanceGroupName: nodes-low-priority
InstanceGroupRole: Node
NodeupConfigHash: C/lz8xS7S7VH2aQEg3hW1XudOlJsrjQZMIVcb+B/dfM=
NodeupConfigHash: 3S0kO0rn8/IeZUrZftL7DVYj+3R6xDMIb4Ntoz8LYwI=

__EOF_KUBE_ENV

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ ConfigServer:
- https://kops-controller.internal.cas-priority-expander-custom.example.com:3988/
InstanceGroupName: nodes
InstanceGroupRole: Node
NodeupConfigHash: C/lz8xS7S7VH2aQEg3hW1XudOlJsrjQZMIVcb+B/dfM=
NodeupConfigHash: 3S0kO0rn8/IeZUrZftL7DVYj+3R6xDMIb4Ntoz8LYwI=

__EOF_KUBE_ENV

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@ FileAssets:
Hooks:
- null
- null
InstallCNIAssets: true
KeypairIDs:
apiserver-aggregator-ca: "6980187172486667078076483355"
etcd-clients-ca: "6979622252718071085282986282"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ ClusterName: cas-priority-expander-custom.example.com
Hooks:
- null
- null
InstallCNIAssets: true
KeypairIDs:
kubernetes-ca: "6982820025135291416230495506"
KubeProxy:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ ClusterName: cas-priority-expander-custom.example.com
Hooks:
- null
- null
InstallCNIAssets: true
KeypairIDs:
kubernetes-ca: "6982820025135291416230495506"
KubeProxy:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ ClusterName: cas-priority-expander-custom.example.com
Hooks:
- null
- null
InstallCNIAssets: true
KeypairIDs:
kubernetes-ca: "6982820025135291416230495506"
KubeProxy:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ ClusterName: cas-priority-expander.example.com
ConfigBase: memfs://clusters.example.com/cas-priority-expander.example.com
InstanceGroupName: master-us-test-1a
InstanceGroupRole: ControlPlane
NodeupConfigHash: JamW6lPVHwg1Um/9IDx4yHpg+8bcXyFe3dO+qyayzoU=
NodeupConfigHash: esCkj8xtANMAq+yucbrXCk+MO2IXoC6224YmTA+HOaA=

__EOF_KUBE_ENV

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ ConfigServer:
- https://kops-controller.internal.cas-priority-expander.example.com:3988/
InstanceGroupName: nodes-high-priority
InstanceGroupRole: Node
NodeupConfigHash: cKBwEi35nMWpDHoZlyWq4rtNBRj/ITyuOOe63pBtfuY=
NodeupConfigHash: df729KN5+gvvqaKyGX1Phg5EnmFTHt0M+RCCyN9ON94=

__EOF_KUBE_ENV

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ ConfigServer:
- https://kops-controller.internal.cas-priority-expander.example.com:3988/
InstanceGroupName: nodes-low-priority
InstanceGroupRole: Node
NodeupConfigHash: cKBwEi35nMWpDHoZlyWq4rtNBRj/ITyuOOe63pBtfuY=
NodeupConfigHash: df729KN5+gvvqaKyGX1Phg5EnmFTHt0M+RCCyN9ON94=

__EOF_KUBE_ENV

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ ConfigServer:
- https://kops-controller.internal.cas-priority-expander.example.com:3988/
InstanceGroupName: nodes
InstanceGroupRole: Node
NodeupConfigHash: cKBwEi35nMWpDHoZlyWq4rtNBRj/ITyuOOe63pBtfuY=
NodeupConfigHash: df729KN5+gvvqaKyGX1Phg5EnmFTHt0M+RCCyN9ON94=

__EOF_KUBE_ENV

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@ FileAssets:
Hooks:
- null
- null
InstallCNIAssets: true
KeypairIDs:
apiserver-aggregator-ca: "6980187172486667078076483355"
etcd-clients-ca: "6979622252718071085282986282"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ ClusterName: cas-priority-expander.example.com
Hooks:
- null
- null
InstallCNIAssets: true
KeypairIDs:
kubernetes-ca: "6982820025135291416230495506"
KubeProxy:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ ClusterName: cas-priority-expander.example.com
Hooks:
- null
- null
InstallCNIAssets: true
KeypairIDs:
kubernetes-ca: "6982820025135291416230495506"
KubeProxy:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ ClusterName: cas-priority-expander.example.com
Hooks:
- null
- null
InstallCNIAssets: true
KeypairIDs:
kubernetes-ca: "6982820025135291416230495506"
KubeProxy:
Expand Down
Loading
Loading