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

Merge pull request #12752 from johngmyers/upgrade-amazonvpc 

Upgrade amazonvpc to v0.10.1
This commit is contained in:
Kubernetes Prow Robot 2021-11-15 21:45:26 -08:00 committed by GitHub
parent f69399eac6 aa2dbcd6ea
commit 38ad64dde5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 47 additions and 17 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_bucket_object_minimal.example.com-addons-bootstrap_content
View File

@ -118,7 +118,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: 3522f8761e75814ac416ad7640e77303c489201144499610528a9c50b02185b0 manifestHash: e45d8969bb1f6e1a6778bfe6a716d35d3fefdda09dfb3399f9a088bd09bef109
name: networking.amazon-vpc-routed-eni name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all needsRollingUpdate: all
selector: selector:

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

@ -159,13 +159,17 @@ spec:
- env: - env:
- name: AWS_VPC_K8S_CNI_CONFIGURE_RPFILTER - name: AWS_VPC_K8S_CNI_CONFIGURE_RPFILTER
value: "false" value: "false"
- name: ENABLE_IPv4
value: "true"
- name: ENABLE_IPv6
value: "false"
- name: MY_NODE_NAME - name: MY_NODE_NAME
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.nodeName fieldPath: spec.nodeName
- name: CLUSTER_NAME - name: CLUSTER_NAME
value: minimal.example.com value: minimal.example.com
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.9.3 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.10.1
imagePullPolicy: Always imagePullPolicy: Always
livenessProbe: livenessProbe:
exec: exec:
@ -214,7 +218,7 @@ spec:
- env: - env:
- name: DISABLE_TCP_EARLY_DEMUX - name: DISABLE_TCP_EARLY_DEMUX
value: "false" value: "false"
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.9.3 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.10.1
imagePullPolicy: Always imagePullPolicy: Always
name: aws-vpc-cni-init name: aws-vpc-cni-init
securityContext: securityContext:

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

@ -118,7 +118,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: 3522f8761e75814ac416ad7640e77303c489201144499610528a9c50b02185b0 manifestHash: e45d8969bb1f6e1a6778bfe6a716d35d3fefdda09dfb3399f9a088bd09bef109
name: networking.amazon-vpc-routed-eni name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all needsRollingUpdate: all
selector: selector:

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

@ -159,13 +159,17 @@ spec:
- env: - env:
- name: AWS_VPC_K8S_CNI_CONFIGURE_RPFILTER - name: AWS_VPC_K8S_CNI_CONFIGURE_RPFILTER
value: "false" value: "false"
- name: ENABLE_IPv4
value: "true"
- name: ENABLE_IPv6
value: "false"
- name: MY_NODE_NAME - name: MY_NODE_NAME
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.nodeName fieldPath: spec.nodeName
- name: CLUSTER_NAME - name: CLUSTER_NAME
value: minimal.example.com value: minimal.example.com
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.9.3 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.10.1
imagePullPolicy: Always imagePullPolicy: Always
livenessProbe: livenessProbe:
exec: exec:
@ -214,7 +218,7 @@ spec:
- env: - env:
- name: DISABLE_TCP_EARLY_DEMUX - name: DISABLE_TCP_EARLY_DEMUX
value: "false" value: "false"
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.9.3 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.10.1
imagePullPolicy: Always imagePullPolicy: Always
name: aws-vpc-cni-init name: aws-vpc-cni-init
securityContext: securityContext:

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

@ -118,7 +118,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: 3522f8761e75814ac416ad7640e77303c489201144499610528a9c50b02185b0 manifestHash: e45d8969bb1f6e1a6778bfe6a716d35d3fefdda09dfb3399f9a088bd09bef109
name: networking.amazon-vpc-routed-eni name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all needsRollingUpdate: all
selector: selector:

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

@ -159,13 +159,17 @@ spec:
- env: - env:
- name: AWS_VPC_K8S_CNI_CONFIGURE_RPFILTER - name: AWS_VPC_K8S_CNI_CONFIGURE_RPFILTER
value: "false" value: "false"
- name: ENABLE_IPv4
value: "true"
- name: ENABLE_IPv6
value: "false"
- name: MY_NODE_NAME - name: MY_NODE_NAME
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.nodeName fieldPath: spec.nodeName
- name: CLUSTER_NAME - name: CLUSTER_NAME
value: minimal.example.com value: minimal.example.com
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.9.3 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.10.1
imagePullPolicy: Always imagePullPolicy: Always
livenessProbe: livenessProbe:
exec: exec:
@ -214,7 +218,7 @@ spec:
- env: - env:
- name: DISABLE_TCP_EARLY_DEMUX - name: DISABLE_TCP_EARLY_DEMUX
value: "false" value: "false"
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.9.3 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.10.1
imagePullPolicy: Always imagePullPolicy: Always
name: aws-vpc-cni-init name: aws-vpc-cni-init
securityContext: securityContext:

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

@ -109,11 +109,15 @@ spec:
hostNetwork: true hostNetwork: true
initContainers: initContainers:
- name: aws-vpc-cni-init - name: aws-vpc-cni-init
image: "{{- or .Networking.AmazonVPC.InitImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.9.3" }}" image: "{{- or .Networking.AmazonVPC.InitImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.10.1" }}"
imagePullPolicy: Always imagePullPolicy: Always
env: env:
- name: DISABLE_TCP_EARLY_DEMUX - name: DISABLE_TCP_EARLY_DEMUX
value: "false" value: "false"
{{- if IsIPv6Only }}
- name: ENABLE_IPv6
value: "true"
{{- end }}
securityContext: securityContext:
privileged: true privileged: true
volumeMounts: volumeMounts:
@ -127,7 +131,7 @@ spec:
{} {}
containers: containers:
- name: aws-node - name: aws-node
image: "{{- or .Networking.AmazonVPC.ImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.9.3" }}" image: "{{- or .Networking.AmazonVPC.ImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.10.1" }}"
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 61678 - containerPort: 61678

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

@ -162,6 +162,12 @@ func (tf *TemplateFunctions) AddTo(dest template.FuncMap, secretStore fi.SecretS
for _, e := range c.Env { for _, e := range c.Env {
envVars[e.Name] = e.Value envVars[e.Name] = e.Value
} }
envVars["ENABLE_IPv4"] = strconv.FormatBool(!cluster.Spec.IsIPv6Only())
envVars["ENABLE_IPv6"] = strconv.FormatBool(cluster.Spec.IsIPv6Only())
if cluster.Spec.IsIPv6Only() {
envVars["ENABLE_PREFIX_DELEGATION"] = "true"
envVars["WARM_PREFIX_TARGET"] = "1"
}
return envVars return envVars
} }
} }

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

@ -54,7 +54,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: 75da98966cc04594813596f6bcd22fa34987f3ac91c44803659729c0c759f462 manifestHash: 76438b822817f225ab6fef37503012029f06c3fbee07f1c982ef068cc34388e2
name: networking.amazon-vpc-routed-eni name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all needsRollingUpdate: all
selector: selector:

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

@ -161,6 +161,10 @@ spec:
value: "false" value: "false"
- name: AWS_VPC_K8S_CNI_LOGLEVEL - name: AWS_VPC_K8S_CNI_LOGLEVEL
value: debug value: debug
- name: ENABLE_IPv4
value: "true"
- name: ENABLE_IPv6
value: "false"
- name: WARM_IP_TARGET - name: WARM_IP_TARGET
value: "10" value: "10"
- name: MY_NODE_NAME - name: MY_NODE_NAME
@ -169,7 +173,7 @@ spec:
fieldPath: spec.nodeName fieldPath: spec.nodeName
- name: CLUSTER_NAME - name: CLUSTER_NAME
value: minimal.example.com value: minimal.example.com
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.9.3 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.10.1
imagePullPolicy: Always imagePullPolicy: Always
livenessProbe: livenessProbe:
exec: exec:
@ -218,7 +222,7 @@ spec:
- env: - env:
- name: DISABLE_TCP_EARLY_DEMUX - name: DISABLE_TCP_EARLY_DEMUX
value: "false" value: "false"
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.9.3 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.10.1
imagePullPolicy: Always imagePullPolicy: Always
name: aws-vpc-cni-init name: aws-vpc-cni-init
securityContext: securityContext:

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

@ -54,7 +54,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: 75da98966cc04594813596f6bcd22fa34987f3ac91c44803659729c0c759f462 manifestHash: 76438b822817f225ab6fef37503012029f06c3fbee07f1c982ef068cc34388e2
name: networking.amazon-vpc-routed-eni name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all needsRollingUpdate: all
selector: selector:

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

@ -161,6 +161,10 @@ spec:
value: "false" value: "false"
- name: AWS_VPC_K8S_CNI_LOGLEVEL - name: AWS_VPC_K8S_CNI_LOGLEVEL
value: debug value: debug
- name: ENABLE_IPv4
value: "true"
- name: ENABLE_IPv6
value: "false"
- name: WARM_IP_TARGET - name: WARM_IP_TARGET
value: "10" value: "10"
- name: MY_NODE_NAME - name: MY_NODE_NAME
@ -169,7 +173,7 @@ spec:
fieldPath: spec.nodeName fieldPath: spec.nodeName
- name: CLUSTER_NAME - name: CLUSTER_NAME
value: minimal.example.com value: minimal.example.com
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.9.3 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.10.1
imagePullPolicy: Always imagePullPolicy: Always
livenessProbe: livenessProbe:
exec: exec:
@ -218,7 +222,7 @@ spec:
- env: - env:
- name: DISABLE_TCP_EARLY_DEMUX - name: DISABLE_TCP_EARLY_DEMUX
value: "false" value: "false"
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.9.3 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.10.1
imagePullPolicy: Always imagePullPolicy: Always
name: aws-vpc-cni-init name: aws-vpc-cni-init
securityContext: securityContext: