diff --git a/CHANGELOG.md b/CHANGELOG.md index 2393d8f85d..55f7c394dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,55 @@ # Changelog +## v1.18.3 + +## What's Changed + +* Feature - [cni-metrics-helper] Expose container port when enabling prometheus metrics by @toVersus in https://github.com/aws/amazon-vpc-cni-k8s/pull/2957 +* Feature - Add extraEnv for add additional env from configmap or secrets to aws-node daemonset by @gawsoftpl in https://github.com/aws/amazon-vpc-cni-k8s/pull/2946 +* Feature - Upgrade to latest versions of GitHub actions by @electrocucaracha in https://github.com/aws/amazon-vpc-cni-k8s/pull/2952 +* Feature - use __MTU__ variable for IPv4 egress-cni too by @benben in https://github.com/aws/amazon-vpc-cni-k8s/pull/2951 + +* Bugfix - Subnet Discovery - Unfilled ENI fix by @jchen6585 in https://github.com/aws/amazon-vpc-cni-k8s/pull/2954 +* Bugfix - Update the APISpec Schema definition for ENIConfig. by @orsenthil in https://github.com/aws/amazon-vpc-cni-k8s/pull/2969 +* Bugfix - Use ECR Mirror for Curl Test Image. by @orsenthil in https://github.com/aws/amazon-vpc-cni-k8s/pull/2956 +* Bugfix - Add unit test and readme update for POD_MTU/ AWS_VPC_ENI_MTU for Egress plugin behavior. by @orsenthil in https://github.com/aws/amazon-vpc-cni-k8s/pull/2979 +* Bugfix - bugfix: templating broken on helm when cniconfig is enabled by @FatPudgeB93 in https://github.com/aws/amazon-vpc-cni-k8s/pull/2983 +* Bugfix - Update vpc_ip_resource_limit.go link in README.md by @kimsehwan96 in https://github.com/aws/amazon-vpc-cni-k8s/pull/2986 +* Bugfix - updating iam doc with subnet policy by @yash97 in https://github.com/aws/amazon-vpc-cni-k8s/pull/2992 + +* Cleanup - Skip Static Canary in run-integration-test in Github. by @orsenthil in https://github.com/aws/amazon-vpc-cni-k8s/pull/2935 +* Cleanup - Helpful Make target to login to public ECR. by @orsenthil in https://github.com/aws/amazon-vpc-cni-k8s/pull/2934 +* Cleanup - Run Kops Test Separately to triage failures. by @orsenthil in https://github.com/aws/amazon-vpc-cni-k8s/pull/2936 +* Cleanup - Update test options default value and help. by @orsenthil in https://github.com/aws/amazon-vpc-cni-k8s/pull/2955 +* Cleanup - Refactor static canary tests. by @orsenthil in https://github.com/aws/amazon-vpc-cni-k8s/pull/2966 + +* Dependency - Update golang to go1.22.3 by @orsenthil in https://github.com/aws/amazon-vpc-cni-k8s/pull/2924 +* Dependency - Bump go.uber.org/zap from 1.26.0 to 1.27.0 by @dependabot in https://github.com/aws/amazon-vpc-cni-k8s/pull/2938 +* Dependency - Bump golang.org/x/sys from 0.19.0 to 0.20.0 in /test/agent by @dependabot in https://github.com/aws/amazon-vpc-cni-k8s/pull/2937 +* Dependency - Update .go-version to 1.22.4 by @orsenthil in https://github.com/aws/amazon-vpc-cni-k8s/pull/2950 +* Dependency - Bump github.com/containernetworking/cni from 1.1.2 to 1.2.0 by @dependabot in https://github.com/aws/amazon-vpc-cni-k8s/pull/2901 +* Dependency - Bump sigs.k8s.io/controller-runtime from 0.17.0 to 0.18.4 by @dependabot in https://github.com/aws/amazon-vpc-cni-k8s/pull/2962 +* Dependency - Bump k8s.io/cli-runtime from 0.29.0 to 0.30.2 by @dependabot in https://github.com/aws/amazon-vpc-cni-k8s/pull/2965 +* Dependency - Bump helm.sh/helm/v3 from 3.14.3 to 3.15.2 by @dependabot in https://github.com/aws/amazon-vpc-cni-k8s/pull/2964 +* Dependency - Bump github.com/aws/aws-sdk-go from 1.51.32 to 1.54.11 by @dependabot in https://github.com/aws/amazon-vpc-cni-k8s/pull/2976 +* Dependency - Bump github.com/go-logr/logr from 1.4.1 to 1.4.2 by @dependabot in https://github.com/aws/amazon-vpc-cni-k8s/pull/2975 +* Dependency - Bump github.com/prometheus/client_golang from 1.19.0 to 1.19.1 by @dependabot in https://github.com/aws/amazon-vpc-cni-k8s/pull/2972 +* Dependency - Bump golang.org/x/sys from 0.20.0 to 0.21.0 in /test/agent by @dependabot in https://github.com/aws/amazon-vpc-cni-k8s/pull/2977 +* Dependency - Bump github.com/containernetworking/plugins from 1.4.1 to 1.5.1 by @dependabot in https://github.com/aws/amazon-vpc-cni-k8s/pull/2974 +* Dependency - chore: Update .go-version by @orsenthil in https://github.com/aws/amazon-vpc-cni-k8s/pull/2981 + +## New Contributors +* @toVersus made their first contribution in https://github.com/aws/amazon-vpc-cni-k8s/pull/2957 +* @electrocucaracha made their first contribution in https://github.com/aws/amazon-vpc-cni-k8s/pull/2952 +* @benben made their first contribution in https://github.com/aws/amazon-vpc-cni-k8s/pull/2951 +* @gawsoftpl made their first contribution in https://github.com/aws/amazon-vpc-cni-k8s/pull/2946 +* @FatPudgeB93 made their first contribution in https://github.com/aws/amazon-vpc-cni-k8s/pull/2983 +* @kimsehwan96 made their first contribution in https://github.com/aws/amazon-vpc-cni-k8s/pull/2986 +* @yash97 made their first contribution in https://github.com/aws/amazon-vpc-cni-k8s/pull/2992 + +**Full Changelog**: https://github.com/aws/amazon-vpc-cni-k8s/compare/v1.18.2...v1.18.3 + + ## v1.18.2 * Enhancement - [Improve "cni-metrics-helper" setup experience](https://github.com/aws/amazon-vpc-cni-k8s/pull/2874) (@guessi) @@ -360,7 +410,7 @@ Was Skipped * Bug - [Fix condition for disable provisioning](https://github.com/aws/amazon-vpc-cni-k8s/pull/1823) (@jayanthvn ) ## v1.10.1 -* Bug - [Use IMDSv2 token when fetching node ip in entrypoint](https://github.com/aws/amazon-vpc-cni-k8s/pull/1727) (#1727, [@chlunde](https://github.com/chlunde)) +* Bug - [Use IMDSv2 token when fetching node ip in entrypoint](https://github.com/aws/amazon-vpc-cni-k8s/pull/1727) (#1727, [@chlunde](https://github.com/chlunde)) ## v1.10.0 * Feature - [IPv6 Support](https://github.com/aws/amazon-vpc-cni-k8s/pull/1587) (#1587, [@achevuru](https://github.com/achevuru)) @@ -375,7 +425,7 @@ Was Skipped * Bug - [Make error count granular](https://github.com/aws/amazon-vpc-cni-k8s/pull/1651) (#1651, [@jayanthvn](https://github.com/jayanthvn)) * Bug - [ServiceAccount should precede DaemonSet in yaml aws](https://github.com/aws/amazon-vpc-cni-k8s/pull/1637) (#1637, [@sramabad1](https://github.com/sramabad1)) * Testing - [Enable unit tests upon PR to release branch](https://github.com/aws/amazon-vpc-cni-k8s/pull/1684) (#1684, [@vikasmb](https://github.com/vikasmb)) -* Testing - [Upgrade EKS cluster version](https://github.com/aws/amazon-vpc-cni-k8s/pull/1680) (#1680, [@vikasmb](https://github.com/vikasmb)) +* Testing - [Upgrade EKS cluster version](https://github.com/aws/amazon-vpc-cni-k8s/pull/1680) (#1680, [@vikasmb](https://github.com/vikasmb)) ## v1.9.1 * Enhancement - [Support DISABLE_NETWORK_RESOURCE_PROVISIONING](https://github.com/aws/amazon-vpc-cni-k8s/pull/1586) (#1586, [@jayanthvn](https://github.com/jayanthvn)) @@ -507,7 +557,7 @@ Was Skipped ## v1.7.1 * Bug - [Calico deletes routes when using CNI v1.7.0](https://github.com/aws/amazon-vpc-cni-k8s/pull/1166) (#1166, [@jayanthvn](https://github.com/jayanthvn)) -* Improvement - [enable manual override for VERSION in images](https://github.com/aws/amazon-vpc-cni-k8s/pull/1156) (#1156, [@nprab428](https://github.com/nprab428)) +* Improvement - [enable manual override for VERSION in images](https://github.com/aws/amazon-vpc-cni-k8s/pull/1156) (#1156, [@nprab428](https://github.com/nprab428)) ## v1.7.0 @@ -729,9 +779,9 @@ Was Skipped * Improvement - [Explicitly set the IP on secondary ENIs](https://github.com/aws/amazon-vpc-cni-k8s/pull/271) (#271, [@ewbankkit](https://github.com/ewbankkit)) - Fixes IP bug on older kernels. * Improvement - [Update instance ENI and IP mapping table](https://github.com/aws/amazon-vpc-cni-k8s/pull/275) (#275, [@hmizuma](https://github.com/hmizuma)) - - Adds a1 and c5n instances. (Already included in v1.3.2) + - Adds a1 and c5n instances. (Already included in v1.3.2) * Improvement - [Add ENI entries for p3dn.24xlarge instance](https://github.com/aws/amazon-vpc-cni-k8s/pull/274) (#274, [@hmizuma](https://github.com/hmizuma)) - - p3dn.24xlarge was already included in v1.3.2 + - p3dn.24xlarge was already included in v1.3.2 * Improvement - [Use InClusterConfig when CreateKubeClient() was called without args](https://github.com/aws/amazon-vpc-cni-k8s/pull/293) (#293, [@nak3](https://github.com/nak3)) * Improvement - [Expose configuration variables via ipamD to make it debug friendly](https://github.com/aws/amazon-vpc-cni-k8s/pull/287) (#287, [@nak3](https://github.com/nak3)) * Improvement - [Allow cross compile on different platform ](https://github.com/aws/amazon-vpc-cni-k8s/pull/292) (#292, [@nak3](https://github.com/nak3)) diff --git a/charts/aws-vpc-cni/Chart.yaml b/charts/aws-vpc-cni/Chart.yaml index 9e647dcb83..e843f15fb9 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.2 -appVersion: "v1.18.2" +version: 1.18.3 +appVersion: "v1.18.3" 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 1b6936a1dc..aea9b8611d 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.2` | +| `image.tag` | Image tag | `v1.18.3` | | `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.2` | +| `init.image.tag` | Image tag | `v1.18.3` | | `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` | diff --git a/charts/aws-vpc-cni/values.yaml b/charts/aws-vpc-cni/values.yaml index 85d77ac3e6..8340c9f802 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.2 + tag: v1.18.3 domain: amazonaws.com region: us-west-2 endpoint: ecr @@ -51,7 +51,7 @@ nodeAgent: resources: {} image: - tag: v1.18.2 + tag: v1.18.3 domain: amazonaws.com region: us-west-2 endpoint: ecr @@ -86,7 +86,7 @@ env: ENABLE_IPv4: "true" ENABLE_IPv6: "false" ENABLE_SUBNET_DISCOVERY: "true" - VPC_CNI_VERSION: "v1.18.2" + VPC_CNI_VERSION: "v1.18.3" NETWORK_POLICY_ENFORCING_MODE: "standard" # Add env from configMap or from secrets diff --git a/charts/cni-metrics-helper/Chart.yaml b/charts/cni-metrics-helper/Chart.yaml index e3c4721fbb..77ede978c0 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.2 -appVersion: v1.18.2 +version: 1.18.3 +appVersion: v1.18.3 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/README.md b/charts/cni-metrics-helper/README.md index 09637235cf..68cfa3aa39 100644 --- a/charts/cni-metrics-helper/README.md +++ b/charts/cni-metrics-helper/README.md @@ -60,7 +60,7 @@ The following table lists the configurable parameters for this chart and their d | -------------------------------|---------------------------------------------------------------|-------------------------------------| | `affinity` | Map of node/pod affinities | `{}` | | `fullnameOverride` | Override the fullname of the chart | `cni-metrics-helper` | -| `image.tag` | Image tag | `v1.18.2` | +| `image.tag` | Image tag | `v1.18.3` | | `image.domain` | ECR repository domain | `amazonaws.com` | | `image.region` | ECR repository region to use. Should match your cluster | `us-west-2` | | `image.account` | ECR repository account number | `602401143452` | diff --git a/charts/cni-metrics-helper/values.yaml b/charts/cni-metrics-helper/values.yaml index edf99213c0..8d462ef385 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.2 + tag: v1.18.3 account: "602401143452" domain: "amazonaws.com" # Set to use custom image @@ -25,7 +25,7 @@ serviceAccount: # If not set and create is true, a name is generated using the fullname template name: annotations: {} - # eks.amazonaws.com/role-arn: arn:aws:iam::AWS_ACCOUNT_ID:role/IAM_ROLE_NAME + # eks.amazonaws.com/role-arn: arn:aws:iam::AWS_ACCOUNT_ID:role/IAM_ROLE_NAME resources: {} diff --git a/config/master/aws-k8s-cni-cn.yaml b/config/master/aws-k8s-cni-cn.yaml index 5e47fb81ab..509f86a546 100644 --- a/config/master/aws-k8s-cni-cn.yaml +++ b/config/master/aws-k8s-cni-cn.yaml @@ -266,7 +266,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.2" + app.kubernetes.io/version: "v1.18.3" --- # Source: aws-vpc-cni/templates/configmap.yaml apiVersion: v1 @@ -278,7 +278,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.2" + app.kubernetes.io/version: "v1.18.3" data: enable-windows-ipam: "false" enable-network-policy-controller: "false" @@ -297,7 +297,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.2" + app.kubernetes.io/version: "v1.18.3" rules: - apiGroups: - crd.k8s.amazonaws.com @@ -343,7 +343,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.2" + app.kubernetes.io/version: "v1.18.3" roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -363,7 +363,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.2" + app.kubernetes.io/version: "v1.18.3" spec: updateStrategy: rollingUpdate: @@ -384,7 +384,7 @@ 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.2 + image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni-init:v1.18.3 env: - name: DISABLE_TCP_EARLY_DEMUX value: "false" @@ -405,7 +405,7 @@ spec: {} containers: - name: aws-node - image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.18.2 + image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.18.3 ports: - containerPort: 61678 name: metrics @@ -469,7 +469,7 @@ spec: - name: NETWORK_POLICY_ENFORCING_MODE value: "standard" - name: VPC_CNI_VERSION - value: "v1.18.2" + value: "v1.18.3" - name: WARM_ENI_TARGET value: "1" - name: WARM_PREFIX_TARGET 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 42b7493257..72912bdfb6 100644 --- a/config/master/aws-k8s-cni-us-gov-east-1.yaml +++ b/config/master/aws-k8s-cni-us-gov-east-1.yaml @@ -266,7 +266,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.2" + app.kubernetes.io/version: "v1.18.3" --- # Source: aws-vpc-cni/templates/configmap.yaml apiVersion: v1 @@ -278,7 +278,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.2" + app.kubernetes.io/version: "v1.18.3" data: enable-windows-ipam: "false" enable-network-policy-controller: "false" @@ -297,7 +297,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.2" + app.kubernetes.io/version: "v1.18.3" rules: - apiGroups: - crd.k8s.amazonaws.com @@ -343,7 +343,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.2" + app.kubernetes.io/version: "v1.18.3" roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -363,7 +363,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.2" + app.kubernetes.io/version: "v1.18.3" spec: updateStrategy: rollingUpdate: @@ -384,7 +384,7 @@ 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.2 + image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni-init:v1.18.3 env: - name: DISABLE_TCP_EARLY_DEMUX value: "false" @@ -405,7 +405,7 @@ spec: {} containers: - name: aws-node - image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni:v1.18.2 + image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni:v1.18.3 ports: - containerPort: 61678 name: metrics @@ -469,7 +469,7 @@ spec: - name: NETWORK_POLICY_ENFORCING_MODE value: "standard" - name: VPC_CNI_VERSION - value: "v1.18.2" + value: "v1.18.3" - name: WARM_ENI_TARGET value: "1" - name: WARM_PREFIX_TARGET 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 895ccbe439..cb92624888 100644 --- a/config/master/aws-k8s-cni-us-gov-west-1.yaml +++ b/config/master/aws-k8s-cni-us-gov-west-1.yaml @@ -266,7 +266,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.2" + app.kubernetes.io/version: "v1.18.3" --- # Source: aws-vpc-cni/templates/configmap.yaml apiVersion: v1 @@ -278,7 +278,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.2" + app.kubernetes.io/version: "v1.18.3" data: enable-windows-ipam: "false" enable-network-policy-controller: "false" @@ -297,7 +297,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.2" + app.kubernetes.io/version: "v1.18.3" rules: - apiGroups: - crd.k8s.amazonaws.com @@ -343,7 +343,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.2" + app.kubernetes.io/version: "v1.18.3" roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -363,7 +363,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.2" + app.kubernetes.io/version: "v1.18.3" spec: updateStrategy: rollingUpdate: @@ -384,7 +384,7 @@ 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.2 + image: 013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni-init:v1.18.3 env: - name: DISABLE_TCP_EARLY_DEMUX value: "false" @@ -405,7 +405,7 @@ spec: {} containers: - name: aws-node - image: 013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni:v1.18.2 + image: 013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni:v1.18.3 ports: - containerPort: 61678 name: metrics @@ -469,7 +469,7 @@ spec: - name: NETWORK_POLICY_ENFORCING_MODE value: "standard" - name: VPC_CNI_VERSION - value: "v1.18.2" + value: "v1.18.3" - name: WARM_ENI_TARGET value: "1" - name: WARM_PREFIX_TARGET diff --git a/config/master/aws-k8s-cni.yaml b/config/master/aws-k8s-cni.yaml index a4c3788a03..2afd7945ee 100644 --- a/config/master/aws-k8s-cni.yaml +++ b/config/master/aws-k8s-cni.yaml @@ -266,7 +266,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.2" + app.kubernetes.io/version: "v1.18.3" --- # Source: aws-vpc-cni/templates/configmap.yaml apiVersion: v1 @@ -278,7 +278,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.2" + app.kubernetes.io/version: "v1.18.3" data: enable-windows-ipam: "false" enable-network-policy-controller: "false" @@ -297,7 +297,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.2" + app.kubernetes.io/version: "v1.18.3" rules: - apiGroups: - crd.k8s.amazonaws.com @@ -343,7 +343,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.2" + app.kubernetes.io/version: "v1.18.3" roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -363,7 +363,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.2" + app.kubernetes.io/version: "v1.18.3" spec: updateStrategy: rollingUpdate: @@ -384,7 +384,7 @@ spec: hostNetwork: true initContainers: - name: aws-vpc-cni-init - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.18.2 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.18.3 env: - name: DISABLE_TCP_EARLY_DEMUX value: "false" @@ -405,7 +405,7 @@ spec: {} containers: - name: aws-node - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.18.2 + image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.18.3 ports: - containerPort: 61678 name: metrics @@ -469,7 +469,7 @@ spec: - name: NETWORK_POLICY_ENFORCING_MODE value: "standard" - name: VPC_CNI_VERSION - value: "v1.18.2" + value: "v1.18.3" - name: WARM_ENI_TARGET value: "1" - name: WARM_PREFIX_TARGET diff --git a/config/master/cni-metrics-helper-cn.yaml b/config/master/cni-metrics-helper-cn.yaml index 70f1cd8c48..1c27aed821 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.2" + app.kubernetes.io/version: "v1.18.3" --- # 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.2" + app.kubernetes.io/version: "v1.18.3" 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.2" + app.kubernetes.io/version: "v1.18.3" 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.2" + app.kubernetes.io/version: "v1.18.3" 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.2" + image: "961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/cni-metrics-helper:v1.18.3" 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 071d9c5876..0f88b2cefc 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.2" + app.kubernetes.io/version: "v1.18.3" --- # 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.2" + app.kubernetes.io/version: "v1.18.3" 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.2" + app.kubernetes.io/version: "v1.18.3" 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.2" + app.kubernetes.io/version: "v1.18.3" 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.2" + image: "151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/cni-metrics-helper:v1.18.3" 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 8c4fd73e53..7432ac67f4 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.2" + app.kubernetes.io/version: "v1.18.3" --- # 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.2" + app.kubernetes.io/version: "v1.18.3" 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.2" + app.kubernetes.io/version: "v1.18.3" 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.2" + app.kubernetes.io/version: "v1.18.3" 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.2" + image: "013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/cni-metrics-helper:v1.18.3" serviceAccountName: cni-metrics-helper diff --git a/config/master/cni-metrics-helper.yaml b/config/master/cni-metrics-helper.yaml index 9e7a7d654d..440d2f1c9a 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.2" + app.kubernetes.io/version: "v1.18.3" --- # 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.2" + app.kubernetes.io/version: "v1.18.3" 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.2" + app.kubernetes.io/version: "v1.18.3" 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.2" + app.kubernetes.io/version: "v1.18.3" 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.2" + image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/cni-metrics-helper:v1.18.3" serviceAccountName: cni-metrics-helper diff --git a/scripts/generate-cni-yaml.sh b/scripts/generate-cni-yaml.sh index baf144dc6e..6fe87f1c64 100755 --- a/scripts/generate-cni-yaml.sh +++ b/scripts/generate-cni-yaml.sh @@ -8,7 +8,7 @@ HELM_VERSION="3.14.2" NAMESPACE="kube-system" MAKEFILEPATH=$SCRIPTPATH/../Makefile -VPC_CNI_VERSION="v1.18.2" +VPC_CNI_VERSION="v1.18.3" NODE_AGENT_VERSION="v1.1.2" BUILD_DIR=$SCRIPTPATH/../build/cni-rel-yamls/$VPC_CNI_VERSION diff --git a/scripts/run-cni-release-tests.sh b/scripts/run-cni-release-tests.sh index 0abf53b4ed..87574e12b0 100755 --- a/scripts/run-cni-release-tests.sh +++ b/scripts/run-cni-release-tests.sh @@ -10,7 +10,7 @@ # NG_LABEL_KEY: nodegroup label key, default "kubernetes.io/os" # NG_LABEL_VAL: nodegroup label val, default "linux" # RUN_DEVEKS_TEST: Set this variable for tests to run on a deveks cluster -# CNI_METRICS_HELPER: cni metrics helper image tag, default "602401143452.dkr.ecr.us-west-2.amazonaws.com/cni-metrics-helper:v1.18.2" +# CNI_METRICS_HELPER: cni metrics helper image tag, default "602401143452.dkr.ecr.us-west-2.amazonaws.com/cni-metrics-helper:v1.18.3" # TEST_IMAGE_REGISTRY: the registry in test-infra-* accounts where e2e test images are stored set -e @@ -37,9 +37,9 @@ function run_integration_test() { echo "cni test took $((SECONDS - START)) seconds." if [[ ! -z $PROD_IMAGE_REGISTRY ]]; then - CNI_METRICS_HELPER="$PROD_IMAGE_REGISTRY/cni-metrics-helper:v1.18.2" + CNI_METRICS_HELPER="$PROD_IMAGE_REGISTRY/cni-metrics-helper:v1.18.3" else - CNI_METRICS_HELPER="${CNI_METRICS_HELPER:=602401143452.dkr.ecr.us-west-2.amazonaws.com/cni-metrics-helper:v1.18.2}" + CNI_METRICS_HELPER="${CNI_METRICS_HELPER:=602401143452.dkr.ecr.us-west-2.amazonaws.com/cni-metrics-helper:v1.18.3}" fi REPO_NAME=$(echo $CNI_METRICS_HELPER | cut -d ":" -f 1)