From 6d40196dac868c1b7e8866c639798c8e2191b864 Mon Sep 17 00:00:00 2001 From: Jay Deokar <23660509+jaydeokar@users.noreply.github.com> Date: Thu, 26 Sep 2024 19:20:42 -0700 Subject: [PATCH] Release manifest, changelog and chart changes (#3048) --- CHANGELOG.md | 18 ++++++ charts/aws-vpc-cni/Chart.yaml | 4 +- charts/aws-vpc-cni/README.md | 6 +- charts/aws-vpc-cni/values.yaml | 6 +- charts/cni-metrics-helper/Chart.yaml | 4 +- charts/cni-metrics-helper/values.yaml | 2 +- config/master/aws-k8s-cni-cn.yaml | 58 +++++++++++++++---- config/master/aws-k8s-cni-us-gov-east-1.yaml | 58 +++++++++++++++---- config/master/aws-k8s-cni-us-gov-west-1.yaml | 58 +++++++++++++++---- config/master/aws-k8s-cni.yaml | 58 +++++++++++++++---- config/master/cni-metrics-helper-cn.yaml | 10 ++-- .../cni-metrics-helper-us-gov-east-1.yaml | 10 ++-- .../cni-metrics-helper-us-gov-west-1.yaml | 10 ++-- config/master/cni-metrics-helper.yaml | 10 ++-- scripts/generate-cni-yaml.sh | 4 +- 15 files changed, 243 insertions(+), 73 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 55f7c394dc..832a6a7c70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,23 @@ # Changelog +## v1.18.4 + +## What's Changed + +* Dependency - Bump golang.org/x/sys from 0.21.0 to 0.22.0 in https://github.com/aws/amazon-vpc-cni-k8s/pull/3005 +* Dependency - Bump github.com/onsi/gomega from 1.33.1 to 1.34.1 https://github.com/aws/amazon-vpc-cni-k8s/pull/3002 +* Dependency - Bump github.com/aws/aws-sdk-go from 1.54.11 to 1.55.5 https://github.com/aws/amazon-vpc-cni-k8s/pull/3000 +* Dependency - Bump github.com/onsi/ginkgo/v2 from 2.19.0 to 2.19.1 https://github.com/aws/amazon-vpc-cni-k8s/pull/3001 +* Dependency - Bump k8s.io/client-go from 0.30.2 to 0.30.3 https://github.com/aws/amazon-vpc-cni-k8s/pull/3003 +* Dependency - Bump github.com/containernetworking/cni from 1.2.0 to 1.2.3 https://github.com/aws/amazon-vpc-cni-k8s/pull/3004 +* Bugfix - fix: init.image.pullPolicy and nodeAgent.image.pullPolicy not being respect https://github.com/aws/amazon-vpc-cni-k8s/pull/3010 +* Dependency - Bump github.com/docker/docker https://github.com/aws/amazon-vpc-cni-k8s/pull/3011 +* Bugfix - Bug fix: Ensure exact IP match between IMDS and local datastore. https://github.com/aws/amazon-vpc-cni-k8s/pull/3033 +* Dependency - Bump github.com/prometheus/client_model from 0.6.0 to 0.6.1 https://github.com/aws/amazon-vpc-cni-k8s/pull/3024 +* Dependency - Bump github.com/coreos/go-iptables from 0.7.0 to 0.8.0 https://github.com/aws/amazon-vpc-cni-k8s/pull/3020 +* Dependency - Bump golang.org/x/sys from 0.22.0 to 0.25.0 https://github.com/aws/amazon-vpc-cni-k8s/pull/3037 +* Dependency - Bump google.golang.org/protobuf from 1.34.1 to 1.34.2 https://github.com/aws/amazon-vpc-cni-k8s/pull/3023 + ## v1.18.3 ## What's Changed diff --git a/charts/aws-vpc-cni/Chart.yaml b/charts/aws-vpc-cni/Chart.yaml index e843f15fb9..76400972c0 100644 --- a/charts/aws-vpc-cni/Chart.yaml +++ b/charts/aws-vpc-cni/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: aws-vpc-cni -version: 1.18.3 -appVersion: "v1.18.3" +version: 1.18.4 +appVersion: "v1.18.4" description: A Helm chart for the AWS VPC CNI icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png home: https://github.com/aws/amazon-vpc-cni-k8s diff --git a/charts/aws-vpc-cni/README.md b/charts/aws-vpc-cni/README.md index aea9b8611d..e444b10d2f 100644 --- a/charts/aws-vpc-cni/README.md +++ b/charts/aws-vpc-cni/README.md @@ -48,7 +48,7 @@ The following table lists the configurable parameters for this chart and their d | `minimumWindowsIPTarget`| Minimum IP target value for Windows prefix delegation | `3` | | `branchENICooldown` | Number of seconds that branch ENIs remain in cooldown | `60` | | `fullnameOverride` | Override the fullname of the chart | `aws-node` | -| `image.tag` | Image tag | `v1.18.3` | +| `image.tag` | Image tag | `v1.18.4` | | `image.domain` | ECR repository domain | `amazonaws.com` | | `image.region` | ECR repository region to use. Should match your cluster | `us-west-2` | | `image.endpoint` | ECR repository endpoint to use. | `ecr` | @@ -56,7 +56,7 @@ The following table lists the configurable parameters for this chart and their d | `image.pullPolicy` | Container pull policy | `IfNotPresent` | | `image.override` | A custom docker image to use | `nil` | | `imagePullSecrets` | Docker registry pull secret | `[]` | -| `init.image.tag` | Image tag | `v1.18.3` | +| `init.image.tag` | Image tag | `v1.18.4` | | `init.image.domain` | ECR repository domain | `amazonaws.com` | | `init.image.region` | ECR repository region to use. Should match your cluster | `us-west-2` | | `init.image.endpoint` | ECR repository endpoint to use. | `ecr` | @@ -69,7 +69,7 @@ The following table lists the configurable parameters for this chart and their d | `originalMatchLabels` | Use the original daemonset matchLabels | `false` | | `nameOverride` | Override the name of the chart | `aws-node` | | `nodeAgent.enabled` | If the Node Agent container should be created | `true` | -| `nodeAgent.image.tag` | Image tag for Node Agent | `v1.1.2` | +| `nodeAgent.image.tag` | Image tag for Node Agent | `v1.1.3` | | `nodeAgent.image.domain`| ECR repository domain | `amazonaws.com` | | `nodeAgent.image.region`| ECR repository region to use. Should match your cluster | `us-west-2` | | `nodeAgent.image.endpoint` | ECR repository endpoint to use. | `ecr` | diff --git a/charts/aws-vpc-cni/values.yaml b/charts/aws-vpc-cni/values.yaml index 8340c9f802..b60ba1fef1 100644 --- a/charts/aws-vpc-cni/values.yaml +++ b/charts/aws-vpc-cni/values.yaml @@ -8,7 +8,7 @@ nameOverride: aws-node init: image: - tag: v1.18.3 + tag: v1.18.4 domain: amazonaws.com region: us-west-2 endpoint: ecr @@ -27,7 +27,7 @@ init: nodeAgent: enabled: true image: - tag: v1.1.2 + tag: v1.1.3 domain: amazonaws.com region: us-west-2 endpoint: ecr @@ -51,7 +51,7 @@ nodeAgent: resources: {} image: - tag: v1.18.3 + tag: v1.18.4 domain: amazonaws.com region: us-west-2 endpoint: ecr diff --git a/charts/cni-metrics-helper/Chart.yaml b/charts/cni-metrics-helper/Chart.yaml index 77ede978c0..4a96e60e58 100644 --- a/charts/cni-metrics-helper/Chart.yaml +++ b/charts/cni-metrics-helper/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: cni-metrics-helper -version: 1.18.3 -appVersion: v1.18.3 +version: 1.18.4 +appVersion: v1.18.4 description: A Helm chart for the AWS VPC CNI Metrics Helper icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png home: https://github.com/aws/amazon-vpc-cni-k8s diff --git a/charts/cni-metrics-helper/values.yaml b/charts/cni-metrics-helper/values.yaml index 8d462ef385..05754812f9 100644 --- a/charts/cni-metrics-helper/values.yaml +++ b/charts/cni-metrics-helper/values.yaml @@ -4,7 +4,7 @@ nameOverride: cni-metrics-helper image: region: us-west-2 - tag: v1.18.3 + tag: v1.18.4 account: "602401143452" domain: "amazonaws.com" # Set to use custom image diff --git a/config/master/aws-k8s-cni-cn.yaml b/config/master/aws-k8s-cni-cn.yaml index 509f86a546..d2348a8f8e 100644 --- a/config/master/aws-k8s-cni-cn.yaml +++ b/config/master/aws-k8s-cni-cn.yaml @@ -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 @@ -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.3" + app.kubernetes.io/version: "v1.18.4" --- # Source: aws-vpc-cni/templates/configmap.yaml apiVersion: v1 @@ -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.3" + app.kubernetes.io/version: "v1.18.4" data: enable-windows-ipam: "false" enable-network-policy-controller: "false" @@ -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.3" + app.kubernetes.io/version: "v1.18.4" rules: - apiGroups: - crd.k8s.amazonaws.com @@ -311,7 +345,7 @@ rules: - apiGroups: [""] resources: - pods - verbs: ["list", "watch", "get"] + verbs: ["list", "watch", "get", "patch"] - apiGroups: [""] resources: - nodes @@ -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.3" + app.kubernetes.io/version: "v1.18.4" roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -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.3" + app.kubernetes.io/version: "v1.18.4" spec: updateStrategy: rollingUpdate: @@ -384,7 +418,8 @@ spec: hostNetwork: true initContainers: - name: aws-vpc-cni-init - image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni-init:v1.18.3 + image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni-init:v1.18.4 + imagePullPolicy: Always env: - name: DISABLE_TCP_EARLY_DEMUX value: "false" @@ -405,7 +440,7 @@ spec: {} containers: - name: aws-node - image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.18.3 + image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.18.4 ports: - containerPort: 61678 name: metrics @@ -430,6 +465,8 @@ spec: env: - name: ADDITIONAL_ENI_TAGS value: "{}" + - name: ANNOTATE_POD_IP + value: "false" - name: AWS_VPC_CNI_NODE_PORT_SUPPORT value: "true" - name: AWS_VPC_ENI_MTU @@ -469,7 +506,7 @@ spec: - name: NETWORK_POLICY_ENFORCING_MODE value: "standard" - name: VPC_CNI_VERSION - value: "v1.18.3" + value: "v1.18.4" - name: WARM_ENI_TARGET value: "1" - name: WARM_PREFIX_TARGET @@ -504,7 +541,8 @@ spec: - mountPath: /run/xtables.lock name: xtables-lock - name: aws-eks-nodeagent - image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon/aws-network-policy-agent:v1.1.2 + image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon/aws-network-policy-agent:v1.1.3 + imagePullPolicy: Always env: - name: MY_NODE_NAME valueFrom: diff --git a/config/master/aws-k8s-cni-us-gov-east-1.yaml b/config/master/aws-k8s-cni-us-gov-east-1.yaml index 72912bdfb6..048d6d9373 100644 --- a/config/master/aws-k8s-cni-us-gov-east-1.yaml +++ b/config/master/aws-k8s-cni-us-gov-east-1.yaml @@ -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 @@ -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.3" + app.kubernetes.io/version: "v1.18.4" --- # Source: aws-vpc-cni/templates/configmap.yaml apiVersion: v1 @@ -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.3" + app.kubernetes.io/version: "v1.18.4" data: enable-windows-ipam: "false" enable-network-policy-controller: "false" @@ -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.3" + app.kubernetes.io/version: "v1.18.4" rules: - apiGroups: - crd.k8s.amazonaws.com @@ -311,7 +345,7 @@ rules: - apiGroups: [""] resources: - pods - verbs: ["list", "watch", "get"] + verbs: ["list", "watch", "get", "patch"] - apiGroups: [""] resources: - nodes @@ -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.3" + app.kubernetes.io/version: "v1.18.4" roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -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.3" + app.kubernetes.io/version: "v1.18.4" spec: updateStrategy: rollingUpdate: @@ -384,7 +418,8 @@ spec: hostNetwork: true initContainers: - name: aws-vpc-cni-init - image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni-init:v1.18.3 + image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni-init:v1.18.4 + imagePullPolicy: Always env: - name: DISABLE_TCP_EARLY_DEMUX value: "false" @@ -405,7 +440,7 @@ spec: {} containers: - name: aws-node - image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni:v1.18.3 + image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni:v1.18.4 ports: - containerPort: 61678 name: metrics @@ -430,6 +465,8 @@ spec: env: - name: ADDITIONAL_ENI_TAGS value: "{}" + - name: ANNOTATE_POD_IP + value: "false" - name: AWS_VPC_CNI_NODE_PORT_SUPPORT value: "true" - name: AWS_VPC_ENI_MTU @@ -469,7 +506,7 @@ spec: - name: NETWORK_POLICY_ENFORCING_MODE value: "standard" - name: VPC_CNI_VERSION - value: "v1.18.3" + value: "v1.18.4" - name: WARM_ENI_TARGET value: "1" - name: WARM_PREFIX_TARGET @@ -504,7 +541,8 @@ spec: - mountPath: /run/xtables.lock name: xtables-lock - name: aws-eks-nodeagent - image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon/aws-network-policy-agent:v1.1.2 + image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon/aws-network-policy-agent:v1.1.3 + imagePullPolicy: Always env: - name: MY_NODE_NAME valueFrom: diff --git a/config/master/aws-k8s-cni-us-gov-west-1.yaml b/config/master/aws-k8s-cni-us-gov-west-1.yaml index cb92624888..b401c5a334 100644 --- a/config/master/aws-k8s-cni-us-gov-west-1.yaml +++ b/config/master/aws-k8s-cni-us-gov-west-1.yaml @@ -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 @@ -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.3" + app.kubernetes.io/version: "v1.18.4" --- # Source: aws-vpc-cni/templates/configmap.yaml apiVersion: v1 @@ -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.3" + app.kubernetes.io/version: "v1.18.4" data: enable-windows-ipam: "false" enable-network-policy-controller: "false" @@ -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.3" + app.kubernetes.io/version: "v1.18.4" rules: - apiGroups: - crd.k8s.amazonaws.com @@ -311,7 +345,7 @@ rules: - apiGroups: [""] resources: - pods - verbs: ["list", "watch", "get"] + verbs: ["list", "watch", "get", "patch"] - apiGroups: [""] resources: - nodes @@ -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.3" + app.kubernetes.io/version: "v1.18.4" roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -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.3" + app.kubernetes.io/version: "v1.18.4" spec: updateStrategy: rollingUpdate: @@ -384,7 +418,8 @@ spec: hostNetwork: true initContainers: - name: aws-vpc-cni-init - image: 013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni-init:v1.18.3 + image: 013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni-init:v1.18.4 + imagePullPolicy: Always env: - name: DISABLE_TCP_EARLY_DEMUX value: "false" @@ -405,7 +440,7 @@ spec: {} containers: - name: aws-node - image: 013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni:v1.18.3 + image: 013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni:v1.18.4 ports: - containerPort: 61678 name: metrics @@ -430,6 +465,8 @@ spec: env: - name: ADDITIONAL_ENI_TAGS value: "{}" + - name: ANNOTATE_POD_IP + value: "false" - name: AWS_VPC_CNI_NODE_PORT_SUPPORT value: "true" - name: AWS_VPC_ENI_MTU @@ -469,7 +506,7 @@ spec: - name: NETWORK_POLICY_ENFORCING_MODE value: "standard" - name: VPC_CNI_VERSION - value: "v1.18.3" + value: "v1.18.4" - name: WARM_ENI_TARGET value: "1" - name: WARM_PREFIX_TARGET @@ -504,7 +541,8 @@ spec: - mountPath: /run/xtables.lock name: xtables-lock - name: aws-eks-nodeagent - image: 013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon/aws-network-policy-agent:v1.1.2 + image: 013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon/aws-network-policy-agent:v1.1.3 + imagePullPolicy: Always env: - name: MY_NODE_NAME valueFrom: diff --git a/config/master/aws-k8s-cni.yaml b/config/master/aws-k8s-cni.yaml index 2afd7945ee..bf340b36dd 100644 --- a/config/master/aws-k8s-cni.yaml +++ b/config/master/aws-k8s-cni.yaml @@ -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 @@ -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.3" + app.kubernetes.io/version: "v1.18.4" --- # Source: aws-vpc-cni/templates/configmap.yaml apiVersion: v1 @@ -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.3" + app.kubernetes.io/version: "v1.18.4" data: enable-windows-ipam: "false" enable-network-policy-controller: "false" @@ -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.3" + app.kubernetes.io/version: "v1.18.4" rules: - apiGroups: - crd.k8s.amazonaws.com @@ -311,7 +345,7 @@ rules: - apiGroups: [""] resources: - pods - verbs: ["list", "watch", "get"] + verbs: ["list", "watch", "get", "patch"] - apiGroups: [""] resources: - nodes @@ -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.3" + app.kubernetes.io/version: "v1.18.4" roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -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.3" + app.kubernetes.io/version: "v1.18.4" spec: updateStrategy: rollingUpdate: @@ -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.3 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.18.4 + imagePullPolicy: Always env: - name: DISABLE_TCP_EARLY_DEMUX value: "false" @@ -405,7 +440,7 @@ spec: {} containers: - name: aws-node - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.18.3 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.18.4 ports: - containerPort: 61678 name: metrics @@ -430,6 +465,8 @@ spec: env: - name: ADDITIONAL_ENI_TAGS value: "{}" + - name: ANNOTATE_POD_IP + value: "false" - name: AWS_VPC_CNI_NODE_PORT_SUPPORT value: "true" - name: AWS_VPC_ENI_MTU @@ -469,7 +506,7 @@ spec: - name: NETWORK_POLICY_ENFORCING_MODE value: "standard" - name: VPC_CNI_VERSION - value: "v1.18.3" + value: "v1.18.4" - name: WARM_ENI_TARGET value: "1" - name: WARM_PREFIX_TARGET @@ -504,7 +541,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.2 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-network-policy-agent:v1.1.3 + imagePullPolicy: Always env: - name: MY_NODE_NAME valueFrom: diff --git a/config/master/cni-metrics-helper-cn.yaml b/config/master/cni-metrics-helper-cn.yaml index 1c27aed821..66525206d0 100644 --- a/config/master/cni-metrics-helper-cn.yaml +++ b/config/master/cni-metrics-helper-cn.yaml @@ -8,7 +8,7 @@ metadata: labels: app.kubernetes.io/name: cni-metrics-helper app.kubernetes.io/instance: cni-metrics-helper - app.kubernetes.io/version: "v1.18.3" + app.kubernetes.io/version: "v1.18.4" --- # Source: cni-metrics-helper/templates/clusterrole.yaml apiVersion: rbac.authorization.k8s.io/v1 @@ -18,7 +18,7 @@ metadata: labels: app.kubernetes.io/name: cni-metrics-helper app.kubernetes.io/instance: cni-metrics-helper - app.kubernetes.io/version: "v1.18.3" + app.kubernetes.io/version: "v1.18.4" rules: - apiGroups: [""] resources: @@ -34,7 +34,7 @@ metadata: labels: app.kubernetes.io/name: cni-metrics-helper app.kubernetes.io/instance: cni-metrics-helper - app.kubernetes.io/version: "v1.18.3" + app.kubernetes.io/version: "v1.18.4" roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -54,7 +54,7 @@ metadata: k8s-app: cni-metrics-helper app.kubernetes.io/name: cni-metrics-helper app.kubernetes.io/instance: cni-metrics-helper - app.kubernetes.io/version: "v1.18.3" + app.kubernetes.io/version: "v1.18.4" spec: revisionHistoryLimit: 10 selector: @@ -78,5 +78,5 @@ spec: - name: USE_PROMETHEUS value: "false" name: cni-metrics-helper - image: "961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/cni-metrics-helper:v1.18.3" + image: "961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/cni-metrics-helper:v1.18.4" serviceAccountName: cni-metrics-helper diff --git a/config/master/cni-metrics-helper-us-gov-east-1.yaml b/config/master/cni-metrics-helper-us-gov-east-1.yaml index 0f88b2cefc..3ea22c829b 100644 --- a/config/master/cni-metrics-helper-us-gov-east-1.yaml +++ b/config/master/cni-metrics-helper-us-gov-east-1.yaml @@ -8,7 +8,7 @@ metadata: labels: app.kubernetes.io/name: cni-metrics-helper app.kubernetes.io/instance: cni-metrics-helper - app.kubernetes.io/version: "v1.18.3" + app.kubernetes.io/version: "v1.18.4" --- # Source: cni-metrics-helper/templates/clusterrole.yaml apiVersion: rbac.authorization.k8s.io/v1 @@ -18,7 +18,7 @@ metadata: labels: app.kubernetes.io/name: cni-metrics-helper app.kubernetes.io/instance: cni-metrics-helper - app.kubernetes.io/version: "v1.18.3" + app.kubernetes.io/version: "v1.18.4" rules: - apiGroups: [""] resources: @@ -34,7 +34,7 @@ metadata: labels: app.kubernetes.io/name: cni-metrics-helper app.kubernetes.io/instance: cni-metrics-helper - app.kubernetes.io/version: "v1.18.3" + app.kubernetes.io/version: "v1.18.4" roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -54,7 +54,7 @@ metadata: k8s-app: cni-metrics-helper app.kubernetes.io/name: cni-metrics-helper app.kubernetes.io/instance: cni-metrics-helper - app.kubernetes.io/version: "v1.18.3" + app.kubernetes.io/version: "v1.18.4" spec: revisionHistoryLimit: 10 selector: @@ -78,5 +78,5 @@ spec: - name: USE_PROMETHEUS value: "false" name: cni-metrics-helper - image: "151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/cni-metrics-helper:v1.18.3" + image: "151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/cni-metrics-helper:v1.18.4" serviceAccountName: cni-metrics-helper diff --git a/config/master/cni-metrics-helper-us-gov-west-1.yaml b/config/master/cni-metrics-helper-us-gov-west-1.yaml index 7432ac67f4..bdb439a955 100644 --- a/config/master/cni-metrics-helper-us-gov-west-1.yaml +++ b/config/master/cni-metrics-helper-us-gov-west-1.yaml @@ -8,7 +8,7 @@ metadata: labels: app.kubernetes.io/name: cni-metrics-helper app.kubernetes.io/instance: cni-metrics-helper - app.kubernetes.io/version: "v1.18.3" + app.kubernetes.io/version: "v1.18.4" --- # Source: cni-metrics-helper/templates/clusterrole.yaml apiVersion: rbac.authorization.k8s.io/v1 @@ -18,7 +18,7 @@ metadata: labels: app.kubernetes.io/name: cni-metrics-helper app.kubernetes.io/instance: cni-metrics-helper - app.kubernetes.io/version: "v1.18.3" + app.kubernetes.io/version: "v1.18.4" rules: - apiGroups: [""] resources: @@ -34,7 +34,7 @@ metadata: labels: app.kubernetes.io/name: cni-metrics-helper app.kubernetes.io/instance: cni-metrics-helper - app.kubernetes.io/version: "v1.18.3" + app.kubernetes.io/version: "v1.18.4" roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -54,7 +54,7 @@ metadata: k8s-app: cni-metrics-helper app.kubernetes.io/name: cni-metrics-helper app.kubernetes.io/instance: cni-metrics-helper - app.kubernetes.io/version: "v1.18.3" + app.kubernetes.io/version: "v1.18.4" spec: revisionHistoryLimit: 10 selector: @@ -78,5 +78,5 @@ spec: - name: USE_PROMETHEUS value: "false" name: cni-metrics-helper - image: "013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/cni-metrics-helper:v1.18.3" + image: "013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/cni-metrics-helper:v1.18.4" serviceAccountName: cni-metrics-helper diff --git a/config/master/cni-metrics-helper.yaml b/config/master/cni-metrics-helper.yaml index 440d2f1c9a..04ce5e2d13 100644 --- a/config/master/cni-metrics-helper.yaml +++ b/config/master/cni-metrics-helper.yaml @@ -8,7 +8,7 @@ metadata: labels: app.kubernetes.io/name: cni-metrics-helper app.kubernetes.io/instance: cni-metrics-helper - app.kubernetes.io/version: "v1.18.3" + app.kubernetes.io/version: "v1.18.4" --- # Source: cni-metrics-helper/templates/clusterrole.yaml apiVersion: rbac.authorization.k8s.io/v1 @@ -18,7 +18,7 @@ metadata: labels: app.kubernetes.io/name: cni-metrics-helper app.kubernetes.io/instance: cni-metrics-helper - app.kubernetes.io/version: "v1.18.3" + app.kubernetes.io/version: "v1.18.4" rules: - apiGroups: [""] resources: @@ -34,7 +34,7 @@ metadata: labels: app.kubernetes.io/name: cni-metrics-helper app.kubernetes.io/instance: cni-metrics-helper - app.kubernetes.io/version: "v1.18.3" + app.kubernetes.io/version: "v1.18.4" roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -54,7 +54,7 @@ metadata: k8s-app: cni-metrics-helper app.kubernetes.io/name: cni-metrics-helper app.kubernetes.io/instance: cni-metrics-helper - app.kubernetes.io/version: "v1.18.3" + app.kubernetes.io/version: "v1.18.4" spec: revisionHistoryLimit: 10 selector: @@ -78,5 +78,5 @@ spec: - name: USE_PROMETHEUS value: "false" name: cni-metrics-helper - image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/cni-metrics-helper:v1.18.3" + image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/cni-metrics-helper:v1.18.4" serviceAccountName: cni-metrics-helper diff --git a/scripts/generate-cni-yaml.sh b/scripts/generate-cni-yaml.sh index 6fe87f1c64..34d585820f 100755 --- a/scripts/generate-cni-yaml.sh +++ b/scripts/generate-cni-yaml.sh @@ -8,8 +8,8 @@ HELM_VERSION="3.14.2" NAMESPACE="kube-system" MAKEFILEPATH=$SCRIPTPATH/../Makefile -VPC_CNI_VERSION="v1.18.3" -NODE_AGENT_VERSION="v1.1.2" +VPC_CNI_VERSION="v1.18.4" +NODE_AGENT_VERSION="v1.1.3" BUILD_DIR=$SCRIPTPATH/../build/cni-rel-yamls/$VPC_CNI_VERSION REGIONS_FILE=$SCRIPTPATH/../charts/regions.json