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

Changelog, chart and manifest updates for v1.18.5 #3050

Merged
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
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Changelog

## v1.18.5

## What's Changed

* Improvement - Filter out interfaces with no ip info by @Pavani-Panakanti in https://github.com/aws/amazon-vpc-cni-k8s/pull/3047

## New Contributors
* @Pavani-Panakanti made their first contribution in https://github.com/aws/amazon-vpc-cni-k8s/pull/3047

## v1.18.4

## What's Changed
Expand Down
4 changes: 2 additions & 2 deletions charts/aws-vpc-cni/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
name: aws-vpc-cni
version: 1.18.4
appVersion: "v1.18.4"
version: 1.18.5
appVersion: "v1.18.5"
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
Expand Down
4 changes: 2 additions & 2 deletions charts/aws-vpc-cni/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@ 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.4` |
| `image.tag` | Image tag | `v1.18.5` |
| `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` |
| `image.account` | ECR repository account number | `602401143452` |
| `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.4` |
| `init.image.tag` | Image tag | `v1.18.5` |
| `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` |
Expand Down
6 changes: 3 additions & 3 deletions charts/aws-vpc-cni/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ nameOverride: aws-node

init:
image:
tag: v1.18.4
tag: v1.18.5
domain: amazonaws.com
region: us-west-2
endpoint: ecr
Expand Down Expand Up @@ -51,7 +51,7 @@ nodeAgent:
resources: {}

image:
tag: v1.18.4
tag: v1.18.5
domain: amazonaws.com
region: us-west-2
endpoint: ecr
Expand Down Expand Up @@ -86,7 +86,7 @@ env:
ENABLE_IPv4: "true"
ENABLE_IPv6: "false"
ENABLE_SUBNET_DISCOVERY: "true"
VPC_CNI_VERSION: "v1.18.3"
VPC_CNI_VERSION: "v1.18.5"
NETWORK_POLICY_ENFORCING_MODE: "standard"

# Add env from configMap or from secrets
Expand Down
4 changes: 2 additions & 2 deletions charts/cni-metrics-helper/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: cni-metrics-helper
version: 1.18.4
appVersion: v1.18.4
version: 1.18.5
appVersion: v1.18.5
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
Expand Down
2 changes: 1 addition & 1 deletion charts/cni-metrics-helper/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.3` |
| `image.tag` | Image tag | `v1.18.5` |
| `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` |
Expand Down
2 changes: 1 addition & 1 deletion charts/cni-metrics-helper/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ nameOverride: cni-metrics-helper

image:
region: us-west-2
tag: v1.18.4
tag: v1.18.5
account: "602401143452"
domain: "amazonaws.com"
# Set to use custom image
Expand Down
6 changes: 3 additions & 3 deletions config/master/aws-k8s-cni-cn.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,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.4
image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni-init:v1.18.5
imagePullPolicy: Always
env:
- name: DISABLE_TCP_EARLY_DEMUX
Expand All @@ -440,7 +440,7 @@ spec:
{}
containers:
- name: aws-node
image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.18.4
image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.18.5
ports:
- containerPort: 61678
name: metrics
Expand Down Expand Up @@ -506,7 +506,7 @@ spec:
- name: NETWORK_POLICY_ENFORCING_MODE
value: "standard"
- name: VPC_CNI_VERSION
value: "v1.18.4"
value: "v1.18.5"
- name: WARM_ENI_TARGET
value: "1"
- name: WARM_PREFIX_TARGET
Expand Down
6 changes: 3 additions & 3 deletions config/master/aws-k8s-cni-us-gov-east-1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,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.4
image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni-init:v1.18.5
imagePullPolicy: Always
env:
- name: DISABLE_TCP_EARLY_DEMUX
Expand All @@ -440,7 +440,7 @@ spec:
{}
containers:
- name: aws-node
image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni:v1.18.4
image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni:v1.18.5
ports:
- containerPort: 61678
name: metrics
Expand Down Expand Up @@ -506,7 +506,7 @@ spec:
- name: NETWORK_POLICY_ENFORCING_MODE
value: "standard"
- name: VPC_CNI_VERSION
value: "v1.18.4"
value: "v1.18.5"
- name: WARM_ENI_TARGET
value: "1"
- name: WARM_PREFIX_TARGET
Expand Down
6 changes: 3 additions & 3 deletions config/master/aws-k8s-cni-us-gov-west-1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,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.4
image: 013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni-init:v1.18.5
imagePullPolicy: Always
env:
- name: DISABLE_TCP_EARLY_DEMUX
Expand All @@ -440,7 +440,7 @@ spec:
{}
containers:
- name: aws-node
image: 013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni:v1.18.4
image: 013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni:v1.18.5
ports:
- containerPort: 61678
name: metrics
Expand Down Expand Up @@ -506,7 +506,7 @@ spec:
- name: NETWORK_POLICY_ENFORCING_MODE
value: "standard"
- name: VPC_CNI_VERSION
value: "v1.18.4"
value: "v1.18.5"
- name: WARM_ENI_TARGET
value: "1"
- name: WARM_PREFIX_TARGET
Expand Down
6 changes: 3 additions & 3 deletions config/master/aws-k8s-cni.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,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.4
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.18.5
imagePullPolicy: Always
env:
- name: DISABLE_TCP_EARLY_DEMUX
Expand All @@ -440,7 +440,7 @@ spec:
{}
containers:
- name: aws-node
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.18.4
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.18.5
ports:
- containerPort: 61678
name: metrics
Expand Down Expand Up @@ -506,7 +506,7 @@ spec:
- name: NETWORK_POLICY_ENFORCING_MODE
value: "standard"
- name: VPC_CNI_VERSION
value: "v1.18.4"
value: "v1.18.5"
- name: WARM_ENI_TARGET
value: "1"
- name: WARM_PREFIX_TARGET
Expand Down
2 changes: 1 addition & 1 deletion config/master/cni-metrics-helper-cn.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.4"
image: "961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/cni-metrics-helper:v1.18.5"
serviceAccountName: cni-metrics-helper
2 changes: 1 addition & 1 deletion config/master/cni-metrics-helper-us-gov-east-1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.4"
image: "151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/cni-metrics-helper:v1.18.5"
serviceAccountName: cni-metrics-helper
2 changes: 1 addition & 1 deletion config/master/cni-metrics-helper-us-gov-west-1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.4"
image: "013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/cni-metrics-helper:v1.18.5"
serviceAccountName: cni-metrics-helper
2 changes: 1 addition & 1 deletion config/master/cni-metrics-helper.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.4"
image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/cni-metrics-helper:v1.18.5"
serviceAccountName: cni-metrics-helper
2 changes: 1 addition & 1 deletion scripts/generate-cni-yaml.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ HELM_VERSION="3.14.2"
NAMESPACE="kube-system"

MAKEFILEPATH=$SCRIPTPATH/../Makefile
VPC_CNI_VERSION="v1.18.4"
VPC_CNI_VERSION="v1.18.5"
NODE_AGENT_VERSION="v1.1.3"
BUILD_DIR=$SCRIPTPATH/../build/cni-rel-yamls/$VPC_CNI_VERSION

Expand Down
6 changes: 3 additions & 3 deletions scripts/run-cni-release-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.3"
# CNI_METRICS_HELPER: cni metrics helper image tag, default "602401143452.dkr.ecr.us-west-2.amazonaws.com/cni-metrics-helper:v1.18.5"
# TEST_IMAGE_REGISTRY: the registry in test-infra-* accounts where e2e test images are stored
set -e

Expand All @@ -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.3"
CNI_METRICS_HELPER="$PROD_IMAGE_REGISTRY/cni-metrics-helper:v1.18.5"
else
CNI_METRICS_HELPER="${CNI_METRICS_HELPER:=602401143452.dkr.ecr.us-west-2.amazonaws.com/cni-metrics-helper:v1.18.3}"
CNI_METRICS_HELPER="${CNI_METRICS_HELPER:=602401143452.dkr.ecr.us-west-2.amazonaws.com/cni-metrics-helper:v1.18.5}"
fi

REPO_NAME=$(echo $CNI_METRICS_HELPER | cut -d ":" -f 1)
Expand Down
Loading