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

Update aws-node to v1.19.2 #7899

Merged
merged 1 commit into from
Jan 11, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
58 changes: 49 additions & 9 deletions pkg/addons/default/assets/aws-node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,40 @@ spec:
openAPIV3Schema:
type: object
x-kubernetes-preserve-unknown-fields: true
description: ENIConfig is the Schema for the eniconfigs API
properties:
apiVersion:
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
spec:
description: ENIConfigSpec defines the desired state of ENIConfig
properties:
securityGroups:
items:
type: string
type: array
subnet:
type: string
required:
- subnet
type: object
status:
description: ENIConfigStatus defines the observed state of ENIConfig
type: object
names:
plural: eniconfigs
singular: eniconfig
Expand Down Expand Up @@ -266,7 +300,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.18.1"
app.kubernetes.io/version: "v1.19.2"
---
# Source: aws-vpc-cni/templates/configmap.yaml
apiVersion: v1
Expand All @@ -278,7 +312,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.18.1"
app.kubernetes.io/version: "v1.19.2"
data:
enable-windows-ipam: "false"
enable-network-policy-controller: "false"
Expand All @@ -297,7 +331,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.18.1"
app.kubernetes.io/version: "v1.19.2"
rules:
- apiGroups:
- crd.k8s.amazonaws.com
Expand Down Expand Up @@ -343,7 +377,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.18.1"
app.kubernetes.io/version: "v1.19.2"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand All @@ -363,7 +397,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.18.1"
app.kubernetes.io/version: "v1.19.2"
spec:
updateStrategy:
rollingUpdate:
Expand All @@ -384,7 +418,8 @@ spec:
hostNetwork: true
initContainers:
- name: aws-vpc-cni-init
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.18.1
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.19.2
imagePullPolicy: Always
env:
- name: DISABLE_TCP_EARLY_DEMUX
value: "false"
Expand All @@ -405,7 +440,7 @@ spec:
{}
containers:
- name: aws-node
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.18.1
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.19.2
ports:
- containerPort: 61678
name: metrics
Expand Down Expand Up @@ -469,7 +504,7 @@ spec:
- name: NETWORK_POLICY_ENFORCING_MODE
value: "standard"
- name: VPC_CNI_VERSION
value: "v1.18.1"
value: "v1.19.2"
- name: WARM_ENI_TARGET
value: "1"
- name: WARM_PREFIX_TARGET
Expand Down Expand Up @@ -504,7 +539,8 @@ spec:
- mountPath: /run/xtables.lock
name: xtables-lock
- name: aws-eks-nodeagent
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.1.1
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.1.6
imagePullPolicy: Always
env:
- name: MY_NODE_NAME
valueFrom:
Expand All @@ -516,6 +552,7 @@ spec:
- --enable-network-policy=false
- --enable-cloudwatch-logs=false
- --enable-policy-event-logs=false
- --log-file=/var/log/aws-routed-eni/network-policy-agent.log
- --metrics-bind-addr=:8162
- --health-probe-bind-addr=:8163
- --conntrack-cache-cleanup-period=300
Expand Down Expand Up @@ -557,6 +594,7 @@ spec:
- name: xtables-lock
hostPath:
path: /run/xtables.lock
type: FileOrCreate
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
Expand All @@ -575,3 +613,5 @@ spec:
operator: NotIn
values:
- fargate
- hybrid
- auto
2 changes: 1 addition & 1 deletion pkg/addons/default/aws_node_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ var _ = Describe("AWS Node", func() {

Describe("UpdateAWSNode", func() {
var preUpdateAwsNode *v1.DaemonSet
const expectedVersion = "v1.18.1"
const expectedVersion = "v1.19.2"
BeforeEach(func() {
loadSamples(rawClient, "testdata/sample-1.15.json")

Expand Down
Loading