Skip to content

Commit

Permalink
Updating Manifest, Changelog and scripts (#3115)
Browse files Browse the repository at this point in the history
  • Loading branch information
jaydeokar authored Nov 14, 2024
1 parent 18a387e commit edf5738
Show file tree
Hide file tree
Showing 17 changed files with 89 additions and 75 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Changelog

## v1.18.5
## v1.19.0

* Manifest update for unsupported compute type

## v1.18.6

### 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.6
appVersion: "v1.18.6"
version: 1.19.0
appVersion: "v1.19.0"
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
6 changes: 3 additions & 3 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.6` |
| `image.tag` | Image tag | `v1.19.0` |
| `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.6` |
| `init.image.tag` | Image tag | `v1.19.0` |
| `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 All @@ -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.4` |
| `nodeAgent.image.tag` | Image tag for Node Agent | `v1.1.5` |
| `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` |
Expand Down
10 changes: 6 additions & 4 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.6
tag: v1.19.0
domain: amazonaws.com
region: us-west-2
endpoint: ecr
Expand All @@ -27,7 +27,7 @@ init:
nodeAgent:
enabled: true
image:
tag: v1.1.4
tag: v1.1.5
domain: amazonaws.com
region: us-west-2
endpoint: ecr
Expand All @@ -51,7 +51,7 @@ nodeAgent:
resources: {}

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

# Add env from configMap or from secrets
Expand Down Expand Up @@ -209,6 +209,8 @@ affinity:
operator: NotIn
values:
- fargate
- hybrid
- auto

eniConfig:
# Specifies whether ENIConfigs should be created
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.6
appVersion: v1.18.6
version: 1.19.0
appVersion: v1.19.0
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.6` |
| `image.tag` | Image tag | `v1.19.0` |
| `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.6
tag: v1.19.0
account: "602401143452"
domain: "amazonaws.com"
# Set to use custom image
Expand Down
20 changes: 11 additions & 9 deletions config/master/aws-k8s-cni-cn.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -300,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.6"
app.kubernetes.io/version: "v1.19.0"
---
# Source: aws-vpc-cni/templates/configmap.yaml
apiVersion: v1
Expand All @@ -312,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.6"
app.kubernetes.io/version: "v1.19.0"
data:
enable-windows-ipam: "false"
enable-network-policy-controller: "false"
Expand All @@ -331,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.6"
app.kubernetes.io/version: "v1.19.0"
rules:
- apiGroups:
- crd.k8s.amazonaws.com
Expand Down Expand Up @@ -377,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.6"
app.kubernetes.io/version: "v1.19.0"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand All @@ -397,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.6"
app.kubernetes.io/version: "v1.19.0"
spec:
updateStrategy:
rollingUpdate:
Expand All @@ -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.6
image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni-init:v1.19.0
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.6
image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.19.0
ports:
- containerPort: 61678
name: metrics
Expand Down Expand Up @@ -504,7 +504,7 @@ spec:
- name: NETWORK_POLICY_ENFORCING_MODE
value: "standard"
- name: VPC_CNI_VERSION
value: "v1.18.6"
value: "v1.19.0"
- name: WARM_ENI_TARGET
value: "1"
- name: WARM_PREFIX_TARGET
Expand Down Expand Up @@ -539,7 +539,7 @@ 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.4
image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon/aws-network-policy-agent:v1.1.5
imagePullPolicy: Always
env:
- name: MY_NODE_NAME
Expand Down Expand Up @@ -613,3 +613,5 @@ spec:
operator: NotIn
values:
- fargate
- hybrid
- auto
20 changes: 11 additions & 9 deletions config/master/aws-k8s-cni-us-gov-east-1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -300,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.6"
app.kubernetes.io/version: "v1.19.0"
---
# Source: aws-vpc-cni/templates/configmap.yaml
apiVersion: v1
Expand All @@ -312,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.6"
app.kubernetes.io/version: "v1.19.0"
data:
enable-windows-ipam: "false"
enable-network-policy-controller: "false"
Expand All @@ -331,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.6"
app.kubernetes.io/version: "v1.19.0"
rules:
- apiGroups:
- crd.k8s.amazonaws.com
Expand Down Expand Up @@ -377,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.6"
app.kubernetes.io/version: "v1.19.0"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand All @@ -397,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.6"
app.kubernetes.io/version: "v1.19.0"
spec:
updateStrategy:
rollingUpdate:
Expand All @@ -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.6
image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni-init:v1.19.0
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.6
image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni:v1.19.0
ports:
- containerPort: 61678
name: metrics
Expand Down Expand Up @@ -504,7 +504,7 @@ spec:
- name: NETWORK_POLICY_ENFORCING_MODE
value: "standard"
- name: VPC_CNI_VERSION
value: "v1.18.6"
value: "v1.19.0"
- name: WARM_ENI_TARGET
value: "1"
- name: WARM_PREFIX_TARGET
Expand Down Expand Up @@ -539,7 +539,7 @@ 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.4
image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon/aws-network-policy-agent:v1.1.5
imagePullPolicy: Always
env:
- name: MY_NODE_NAME
Expand Down Expand Up @@ -613,3 +613,5 @@ spec:
operator: NotIn
values:
- fargate
- hybrid
- auto
20 changes: 11 additions & 9 deletions config/master/aws-k8s-cni-us-gov-west-1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -300,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.6"
app.kubernetes.io/version: "v1.19.0"
---
# Source: aws-vpc-cni/templates/configmap.yaml
apiVersion: v1
Expand All @@ -312,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.6"
app.kubernetes.io/version: "v1.19.0"
data:
enable-windows-ipam: "false"
enable-network-policy-controller: "false"
Expand All @@ -331,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.6"
app.kubernetes.io/version: "v1.19.0"
rules:
- apiGroups:
- crd.k8s.amazonaws.com
Expand Down Expand Up @@ -377,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.6"
app.kubernetes.io/version: "v1.19.0"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand All @@ -397,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.6"
app.kubernetes.io/version: "v1.19.0"
spec:
updateStrategy:
rollingUpdate:
Expand All @@ -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.6
image: 013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni-init:v1.19.0
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.6
image: 013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni:v1.19.0
ports:
- containerPort: 61678
name: metrics
Expand Down Expand Up @@ -504,7 +504,7 @@ spec:
- name: NETWORK_POLICY_ENFORCING_MODE
value: "standard"
- name: VPC_CNI_VERSION
value: "v1.18.6"
value: "v1.19.0"
- name: WARM_ENI_TARGET
value: "1"
- name: WARM_PREFIX_TARGET
Expand Down Expand Up @@ -539,7 +539,7 @@ 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.4
image: 013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon/aws-network-policy-agent:v1.1.5
imagePullPolicy: Always
env:
- name: MY_NODE_NAME
Expand Down Expand Up @@ -613,3 +613,5 @@ spec:
operator: NotIn
values:
- fargate
- hybrid
- auto
Loading

0 comments on commit edf5738

Please sign in to comment.