Skip to content

Commit

Permalink
Update 1.11 release branch config files for 1.11.4 (#2084)
Browse files Browse the repository at this point in the history
  • Loading branch information
jdn5126 authored Sep 12, 2022
1 parent d4e1684 commit d5ea271
Show file tree
Hide file tree
Showing 12 changed files with 45 additions and 45 deletions.
2 changes: 1 addition & 1 deletion 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.1.21
appVersion: "v1.11.4-rc1"
appVersion: "v1.11.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
Expand Down
4 changes: 2 additions & 2 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.11.4-rc1
tag: v1.11.4
region: us-west-2
account: "602401143452"
pullPolicy: Always
Expand All @@ -23,7 +23,7 @@ init:

image:
region: us-west-2
tag: v1.11.4-rc1
tag: v1.11.4
account: "602401143452"
domain: "amazonaws.com"
pullPolicy: Always
Expand Down
2 changes: 1 addition & 1 deletion charts/cni-metrics-helper/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ version: 0.1.11
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
appVersion: v1.11.4-rc1
appVersion: v1.11.4
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.11.4-rc1
tag: v1.11.4
account: "602401143452"
domain: "amazonaws.com"
# Set to use custom image
Expand Down
14 changes: 7 additions & 7 deletions config/master/aws-k8s-cni-cn.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.4-rc1"
app.kubernetes.io/version: "v1.11.4"
---
# Source: aws-vpc-cni/templates/customresourcedefinition.yaml
apiVersion: apiextensions.k8s.io/v1
Expand All @@ -20,7 +20,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.4-rc1"
app.kubernetes.io/version: "v1.11.4"
spec:
scope: Cluster
group: crd.k8s.amazonaws.com
Expand All @@ -47,7 +47,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.4-rc1"
app.kubernetes.io/version: "v1.11.4"
rules:
- apiGroups:
- crd.k8s.amazonaws.com
Expand Down Expand Up @@ -84,7 +84,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.4-rc1"
app.kubernetes.io/version: "v1.11.4"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand All @@ -104,7 +104,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.4-rc1"
app.kubernetes.io/version: "v1.11.4"
spec:
updateStrategy:
rollingUpdate:
Expand All @@ -125,7 +125,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.11.4-rc1"
image: "961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni-init:v1.11.4"
env:
- name: DISABLE_TCP_EARLY_DEMUX
value: "false"
Expand All @@ -143,7 +143,7 @@ spec:
{}
containers:
- name: aws-node
image: "961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.11.4-rc1"
image: "961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.11.4"
ports:
- containerPort: 61678
name: metrics
Expand Down
14 changes: 7 additions & 7 deletions config/master/aws-k8s-cni-us-gov-east-1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.4-rc1"
app.kubernetes.io/version: "v1.11.4"
---
# Source: aws-vpc-cni/templates/customresourcedefinition.yaml
apiVersion: apiextensions.k8s.io/v1
Expand All @@ -20,7 +20,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.4-rc1"
app.kubernetes.io/version: "v1.11.4"
spec:
scope: Cluster
group: crd.k8s.amazonaws.com
Expand All @@ -47,7 +47,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.4-rc1"
app.kubernetes.io/version: "v1.11.4"
rules:
- apiGroups:
- crd.k8s.amazonaws.com
Expand Down Expand Up @@ -84,7 +84,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.4-rc1"
app.kubernetes.io/version: "v1.11.4"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand All @@ -104,7 +104,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.4-rc1"
app.kubernetes.io/version: "v1.11.4"
spec:
updateStrategy:
rollingUpdate:
Expand All @@ -125,7 +125,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.11.4-rc1"
image: "151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni-init:v1.11.4"
env:
- name: DISABLE_TCP_EARLY_DEMUX
value: "false"
Expand All @@ -143,7 +143,7 @@ spec:
{}
containers:
- name: aws-node
image: "151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni:v1.11.4-rc1"
image: "151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni:v1.11.4"
ports:
- containerPort: 61678
name: metrics
Expand Down
14 changes: 7 additions & 7 deletions config/master/aws-k8s-cni-us-gov-west-1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.4-rc1"
app.kubernetes.io/version: "v1.11.4"
---
# Source: aws-vpc-cni/templates/customresourcedefinition.yaml
apiVersion: apiextensions.k8s.io/v1
Expand All @@ -20,7 +20,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.4-rc1"
app.kubernetes.io/version: "v1.11.4"
spec:
scope: Cluster
group: crd.k8s.amazonaws.com
Expand All @@ -47,7 +47,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.4-rc1"
app.kubernetes.io/version: "v1.11.4"
rules:
- apiGroups:
- crd.k8s.amazonaws.com
Expand Down Expand Up @@ -84,7 +84,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.4-rc1"
app.kubernetes.io/version: "v1.11.4"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand All @@ -104,7 +104,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.4-rc1"
app.kubernetes.io/version: "v1.11.4"
spec:
updateStrategy:
rollingUpdate:
Expand All @@ -125,7 +125,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.11.4-rc1"
image: "013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni-init:v1.11.4"
env:
- name: DISABLE_TCP_EARLY_DEMUX
value: "false"
Expand All @@ -143,7 +143,7 @@ spec:
{}
containers:
- name: aws-node
image: "013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni:v1.11.4-rc1"
image: "013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni:v1.11.4"
ports:
- containerPort: 61678
name: metrics
Expand Down
14 changes: 7 additions & 7 deletions config/master/aws-k8s-cni.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.4-rc1"
app.kubernetes.io/version: "v1.11.4"
---
# Source: aws-vpc-cni/templates/customresourcedefinition.yaml
apiVersion: apiextensions.k8s.io/v1
Expand All @@ -20,7 +20,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.4-rc1"
app.kubernetes.io/version: "v1.11.4"
spec:
scope: Cluster
group: crd.k8s.amazonaws.com
Expand All @@ -47,7 +47,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.4-rc1"
app.kubernetes.io/version: "v1.11.4"
rules:
- apiGroups:
- crd.k8s.amazonaws.com
Expand Down Expand Up @@ -84,7 +84,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.4-rc1"
app.kubernetes.io/version: "v1.11.4"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand All @@ -104,7 +104,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.4-rc1"
app.kubernetes.io/version: "v1.11.4"
spec:
updateStrategy:
rollingUpdate:
Expand All @@ -125,7 +125,7 @@ spec:
hostNetwork: true
initContainers:
- name: aws-vpc-cni-init
image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.11.4-rc1"
image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.11.4"
env:
- name: DISABLE_TCP_EARLY_DEMUX
value: "false"
Expand All @@ -143,7 +143,7 @@ spec:
{}
containers:
- name: aws-node
image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.11.4-rc1"
image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.11.4"
ports:
- containerPort: 61678
name: metrics
Expand Down
6 changes: 3 additions & 3 deletions config/master/cni-metrics-helper-cn.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.4-rc1"
app.kubernetes.io/version: "v1.11.4"
---
# Source: cni-metrics-helper/templates/clusterrole.yaml
apiVersion: rbac.authorization.k8s.io/v1
Expand All @@ -30,7 +30,7 @@ metadata:
labels:
app.kubernetes.io/name: cni-metrics-helper
app.kubernetes.io/instance: cni-metrics-helper
app.kubernetes.io/version: "v1.11.4-rc1"
app.kubernetes.io/version: "v1.11.4"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand Down Expand Up @@ -64,5 +64,5 @@ spec:
- name: USE_CLOUDWATCH
value: "true"
name: cni-metrics-helper
image: "961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/cni-metrics-helper:v1.11.4-rc1"
image: "961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/cni-metrics-helper:v1.11.4"
serviceAccountName: cni-metrics-helper
6 changes: 3 additions & 3 deletions config/master/cni-metrics-helper-us-gov-east-1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.4-rc1"
app.kubernetes.io/version: "v1.11.4"
---
# Source: cni-metrics-helper/templates/clusterrole.yaml
apiVersion: rbac.authorization.k8s.io/v1
Expand All @@ -30,7 +30,7 @@ metadata:
labels:
app.kubernetes.io/name: cni-metrics-helper
app.kubernetes.io/instance: cni-metrics-helper
app.kubernetes.io/version: "v1.11.4-rc1"
app.kubernetes.io/version: "v1.11.4"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand Down Expand Up @@ -64,5 +64,5 @@ spec:
- name: USE_CLOUDWATCH
value: "true"
name: cni-metrics-helper
image: "151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/cni-metrics-helper:v1.11.4-rc1"
image: "151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/cni-metrics-helper:v1.11.4"
serviceAccountName: cni-metrics-helper
6 changes: 3 additions & 3 deletions config/master/cni-metrics-helper-us-gov-west-1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.4-rc1"
app.kubernetes.io/version: "v1.11.4"
---
# Source: cni-metrics-helper/templates/clusterrole.yaml
apiVersion: rbac.authorization.k8s.io/v1
Expand All @@ -30,7 +30,7 @@ metadata:
labels:
app.kubernetes.io/name: cni-metrics-helper
app.kubernetes.io/instance: cni-metrics-helper
app.kubernetes.io/version: "v1.11.4-rc1"
app.kubernetes.io/version: "v1.11.4"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand Down Expand Up @@ -64,5 +64,5 @@ spec:
- name: USE_CLOUDWATCH
value: "true"
name: cni-metrics-helper
image: "013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/cni-metrics-helper:v1.11.4-rc1"
image: "013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/cni-metrics-helper:v1.11.4"
serviceAccountName: cni-metrics-helper
6 changes: 3 additions & 3 deletions config/master/cni-metrics-helper.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.4-rc1"
app.kubernetes.io/version: "v1.11.4"
---
# Source: cni-metrics-helper/templates/clusterrole.yaml
apiVersion: rbac.authorization.k8s.io/v1
Expand All @@ -30,7 +30,7 @@ metadata:
labels:
app.kubernetes.io/name: cni-metrics-helper
app.kubernetes.io/instance: cni-metrics-helper
app.kubernetes.io/version: "v1.11.4-rc1"
app.kubernetes.io/version: "v1.11.4"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand Down Expand Up @@ -64,5 +64,5 @@ spec:
- name: USE_CLOUDWATCH
value: "true"
name: cni-metrics-helper
image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/cni-metrics-helper:v1.11.4-rc1"
image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/cni-metrics-helper:v1.11.4"
serviceAccountName: cni-metrics-helper

0 comments on commit d5ea271

Please sign in to comment.