kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14513 from MoShitrit/fix/issue-14495 

AWS CNI template updates
This commit is contained in:
Kubernetes Prow Robot 2022-11-08 15:22:14 -08:00 committed by GitHub
parent 80dc07bbd6 0284232011
commit 774bcde958
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 55 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View File

@ -112,7 +112,7 @@ spec:
version: 9.99.0 version: 9.99.0
- id: k8s-1.16 - id: k8s-1.16
manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml
manifestHash: 2dbc5844330df7de478e4d739f390c1525ce00426302a9bcd5cd7f7ffa9af437 manifestHash: eb20d586506b0f23e7a5af988add18d53aaec515feca8b86e1e692be8198d77f
name: networking.amazon-vpc-routed-eni name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all needsRollingUpdate: all
selector: selector:

4
tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content
View File

@ -220,8 +220,12 @@ spec:
value: "false" value: "false"
- name: ENABLE_POD_ENI - name: ENABLE_POD_ENI
value: "false" value: "false"
- name: ENABLE_PREFIX_DELEGATION
value: "false"
- name: WARM_ENI_TARGET - name: WARM_ENI_TARGET
value: "1" value: "1"
- name: WARM_PREFIX_TARGET
value: "1"
- name: MY_NODE_NAME - name: MY_NODE_NAME
valueFrom: valueFrom:
fieldRef: fieldRef:

2
tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View File

@ -119,7 +119,7 @@ spec:
version: 9.99.0 version: 9.99.0
- id: k8s-1.16 - id: k8s-1.16
manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml
manifestHash: 2dbc5844330df7de478e4d739f390c1525ce00426302a9bcd5cd7f7ffa9af437 manifestHash: eb20d586506b0f23e7a5af988add18d53aaec515feca8b86e1e692be8198d77f
name: networking.amazon-vpc-routed-eni name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all needsRollingUpdate: all
selector: selector:

4
tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content
View File

@ -220,8 +220,12 @@ spec:
value: "false" value: "false"
- name: ENABLE_POD_ENI - name: ENABLE_POD_ENI
value: "false" value: "false"
- name: ENABLE_PREFIX_DELEGATION
value: "false"
- name: WARM_ENI_TARGET - name: WARM_ENI_TARGET
value: "1" value: "1"
- name: WARM_PREFIX_TARGET
value: "1"
- name: MY_NODE_NAME - name: MY_NODE_NAME
valueFrom: valueFrom:
fieldRef: fieldRef:

2
tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View File

@ -119,7 +119,7 @@ spec:
version: 9.99.0 version: 9.99.0
- id: k8s-1.16 - id: k8s-1.16
manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml
manifestHash: 2dbc5844330df7de478e4d739f390c1525ce00426302a9bcd5cd7f7ffa9af437 manifestHash: eb20d586506b0f23e7a5af988add18d53aaec515feca8b86e1e692be8198d77f
name: networking.amazon-vpc-routed-eni name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all needsRollingUpdate: all
selector: selector:

4
tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content
View File

@ -220,8 +220,12 @@ spec:
value: "false" value: "false"
- name: ENABLE_POD_ENI - name: ENABLE_POD_ENI
value: "false" value: "false"
- name: ENABLE_PREFIX_DELEGATION
value: "false"
- name: WARM_ENI_TARGET - name: WARM_ENI_TARGET
value: "1" value: "1"
- name: WARM_PREFIX_TARGET
value: "1"
- name: MY_NODE_NAME - name: MY_NODE_NAME
valueFrom: valueFrom:
fieldRef: fieldRef:

2
tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View File

@ -119,7 +119,7 @@ spec:
version: 9.99.0 version: 9.99.0
- id: k8s-1.16 - id: k8s-1.16
manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml
manifestHash: 2dbc5844330df7de478e4d739f390c1525ce00426302a9bcd5cd7f7ffa9af437 manifestHash: eb20d586506b0f23e7a5af988add18d53aaec515feca8b86e1e692be8198d77f
name: networking.amazon-vpc-routed-eni name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all needsRollingUpdate: all
selector: selector:

4
tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content
View File

@ -220,8 +220,12 @@ spec:
value: "false" value: "false"
- name: ENABLE_POD_ENI - name: ENABLE_POD_ENI
value: "false" value: "false"
- name: ENABLE_PREFIX_DELEGATION
value: "false"
- name: WARM_ENI_TARGET - name: WARM_ENI_TARGET
value: "1" value: "1"
- name: WARM_PREFIX_TARGET
value: "1"
- name: MY_NODE_NAME - name: MY_NODE_NAME
valueFrom: valueFrom:
fieldRef: fieldRef:

2
tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View File

@ -112,7 +112,7 @@ spec:
version: 9.99.0 version: 9.99.0
- id: k8s-1.16 - id: k8s-1.16
manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml
manifestHash: 2dbc5844330df7de478e4d739f390c1525ce00426302a9bcd5cd7f7ffa9af437 manifestHash: eb20d586506b0f23e7a5af988add18d53aaec515feca8b86e1e692be8198d77f
name: networking.amazon-vpc-routed-eni name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all needsRollingUpdate: all
selector: selector:

4
tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content
View File

@ -220,8 +220,12 @@ spec:
value: "false" value: "false"
- name: ENABLE_POD_ENI - name: ENABLE_POD_ENI
value: "false" value: "false"
- name: ENABLE_PREFIX_DELEGATION
value: "false"
- name: WARM_ENI_TARGET - name: WARM_ENI_TARGET
value: "1" value: "1"
- name: WARM_PREFIX_TARGET
value: "1"
- name: MY_NODE_NAME - name: MY_NODE_NAME
valueFrom: valueFrom:
fieldRef: fieldRef:

2
tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View File

@ -112,7 +112,7 @@ spec:
version: 9.99.0 version: 9.99.0
- id: k8s-1.16 - id: k8s-1.16
manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml
manifestHash: 2dbc5844330df7de478e4d739f390c1525ce00426302a9bcd5cd7f7ffa9af437 manifestHash: eb20d586506b0f23e7a5af988add18d53aaec515feca8b86e1e692be8198d77f
name: networking.amazon-vpc-routed-eni name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all needsRollingUpdate: all
selector: selector:

4
tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content
View File

@ -220,8 +220,12 @@ spec:
value: "false" value: "false"
- name: ENABLE_POD_ENI - name: ENABLE_POD_ENI
value: "false" value: "false"
- name: ENABLE_PREFIX_DELEGATION
value: "false"
- name: WARM_ENI_TARGET - name: WARM_ENI_TARGET
value: "1" value: "1"
- name: WARM_PREFIX_TARGET
value: "1"
- name: MY_NODE_NAME - name: MY_NODE_NAME
valueFrom: valueFrom:
fieldRef: fieldRef:

2
tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View File

@ -112,7 +112,7 @@ spec:
version: 9.99.0 version: 9.99.0
- id: k8s-1.16 - id: k8s-1.16
manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml
manifestHash: 2dbc5844330df7de478e4d739f390c1525ce00426302a9bcd5cd7f7ffa9af437 manifestHash: eb20d586506b0f23e7a5af988add18d53aaec515feca8b86e1e692be8198d77f
name: networking.amazon-vpc-routed-eni name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all needsRollingUpdate: all
selector: selector:

4
tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content
View File

@ -220,8 +220,12 @@ spec:
value: "false" value: "false"
- name: ENABLE_POD_ENI - name: ENABLE_POD_ENI
value: "false" value: "false"
- name: ENABLE_PREFIX_DELEGATION
value: "false"
- name: WARM_ENI_TARGET - name: WARM_ENI_TARGET
value: "1" value: "1"
- name: WARM_PREFIX_TARGET
value: "1"
- name: MY_NODE_NAME - name: MY_NODE_NAME
valueFrom: valueFrom:
fieldRef: fieldRef:

7
upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.16.yaml.template
View File

@ -59,10 +59,17 @@ rules:
resources: resources:
- namespaces - namespaces
verbs: ["list", "watch", "get"] verbs: ["list", "watch", "get"]
{{- if AmazonVpcEnvVars.ANNOTATE_POD_IP }}
- apiGroups: [""]
resources:
- pods
verbs: ["list", "watch", "get", "patch"]
{{- else }}
- apiGroups: [""] - apiGroups: [""]
resources: resources:
- pods - pods
verbs: ["list", "watch", "get"] verbs: ["list", "watch", "get"]
{{- end }}
- apiGroups: [""] - apiGroups: [""]
resources: resources:
- nodes - nodes

3
upup/pkg/fi/cloudup/template_functions.go
View File

@ -195,6 +195,7 @@ func (tf *TemplateFunctions) AddTo(dest template.FuncMap, secretStore fi.SecretS
envVars := map[string]string{ envVars := map[string]string{
// Use defaults from the official AWS VPC CNI Helm chart: // Use defaults from the official AWS VPC CNI Helm chart:
// https://github.com/aws/amazon-vpc-cni-k8s/blob/master/charts/aws-vpc-cni/values.yaml // https://github.com/aws/amazon-vpc-cni-k8s/blob/master/charts/aws-vpc-cni/values.yaml
"ADDITIONAL_ENI_TAGS": "{}",
"AWS_VPC_CNI_NODE_PORT_SUPPORT": "true", "AWS_VPC_CNI_NODE_PORT_SUPPORT": "true",
"AWS_VPC_ENI_MTU": "9001", "AWS_VPC_ENI_MTU": "9001",
"AWS_VPC_K8S_CNI_CONFIGURE_RPFILTER": "false", "AWS_VPC_K8S_CNI_CONFIGURE_RPFILTER": "false",
@ -209,7 +210,9 @@ func (tf *TemplateFunctions) AddTo(dest template.FuncMap, secretStore fi.SecretS
"DISABLE_INTROSPECTION": "false", "DISABLE_INTROSPECTION": "false",
"DISABLE_METRICS": "false", "DISABLE_METRICS": "false",
"ENABLE_POD_ENI": "false", "ENABLE_POD_ENI": "false",
"ENABLE_PREFIX_DELEGATION": "false",
"WARM_ENI_TARGET": "1", "WARM_ENI_TARGET": "1",
"WARM_PREFIX_TARGET": "1",
"DISABLE_NETWORK_RESOURCE_PROVISIONING": "false", "DISABLE_NETWORK_RESOURCE_PROVISIONING": "false",
} }
for _, e := range c.Env { for _, e := range c.Env {

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml
View File

@ -48,7 +48,7 @@ spec:
version: 9.99.0 version: 9.99.0
- id: k8s-1.16 - id: k8s-1.16
manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml
manifestHash: 500058623d10114e2de790f0fb39ad62a53b1ef3517db252ab82e8fdad87d25d manifestHash: 550350671833a707fdcdc8a2d95f96694e9fadff927db9ed6af5924ca91df1c5
name: networking.amazon-vpc-routed-eni name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all needsRollingUpdate: all
selector: selector:

4
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/networking.amazon-vpc-routed-eni-k8s-1.16.yaml
View File

@ -220,10 +220,14 @@ spec:
value: "false" value: "false"
- name: ENABLE_POD_ENI - name: ENABLE_POD_ENI
value: "false" value: "false"
- name: ENABLE_PREFIX_DELEGATION
value: "false"
- name: WARM_ENI_TARGET - name: WARM_ENI_TARGET
value: "1" value: "1"
- name: WARM_IP_TARGET - name: WARM_IP_TARGET
value: "10" value: "10"
- name: WARM_PREFIX_TARGET
value: "1"
- name: MY_NODE_NAME - name: MY_NODE_NAME
valueFrom: valueFrom:
fieldRef: fieldRef:

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml
View File

@ -48,7 +48,7 @@ spec:
version: 9.99.0 version: 9.99.0
- id: k8s-1.16 - id: k8s-1.16
manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml
manifestHash: 500058623d10114e2de790f0fb39ad62a53b1ef3517db252ab82e8fdad87d25d manifestHash: 550350671833a707fdcdc8a2d95f96694e9fadff927db9ed6af5924ca91df1c5
name: networking.amazon-vpc-routed-eni name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all needsRollingUpdate: all
selector: selector:

4
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/networking.amazon-vpc-routed-eni-k8s-1.16.yaml
View File

@ -220,10 +220,14 @@ spec:
value: "false" value: "false"
- name: ENABLE_POD_ENI - name: ENABLE_POD_ENI
value: "false" value: "false"
- name: ENABLE_PREFIX_DELEGATION
value: "false"
- name: WARM_ENI_TARGET - name: WARM_ENI_TARGET
value: "1" value: "1"
- name: WARM_IP_TARGET - name: WARM_IP_TARGET
value: "10" value: "10"
- name: WARM_PREFIX_TARGET
value: "1"
- name: MY_NODE_NAME - name: MY_NODE_NAME
valueFrom: valueFrom:
fieldRef: fieldRef: