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

🥳 aws-vpc-cni-k8s v1.20.4 Automated manifest sync! 🥑 #19

Open
wants to merge 25 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
51ec392
Update upload-resources-to-github.sh
jayanthvn Dec 1, 2021
16c8bf5
Create test.yml
jayanthvn Dec 1, 2021
787ee72
Update upload-resources-to-github.sh
jayanthvn Dec 1, 2021
8fc9366
Update upload-resources-to-github.sh
jayanthvn Dec 1, 2021
12afcbb
Update upload-resources-to-github.sh
jayanthvn Dec 1, 2021
d29a93c
Update upload-resources-to-github.sh
jayanthvn Dec 1, 2021
60dbc70
Update upload-resources-to-github.sh
jayanthvn Dec 1, 2021
1db643c
Update test.yml
jayanthvn Dec 1, 2021
7a44a81
Update upload-resources-to-github.sh
jayanthvn Dec 1, 2021
62955be
Update upload-resources-to-github.sh
jayanthvn Dec 1, 2021
3f543c1
Update upload-resources-to-github.sh
jayanthvn Dec 1, 2021
a9df51a
Update test.yml
jayanthvn Dec 1, 2021
7276884
Update upload-resources-to-github.sh
jayanthvn Dec 1, 2021
dd997fa
Update upload-resources-to-github.sh
jayanthvn Dec 1, 2021
40f58a8
Update values.yaml
jayanthvn Dec 1, 2021
05f77e0
Update values.yaml
jayanthvn Dec 1, 2021
4dd8f98
Update generate-cni-yaml.sh
jayanthvn Dec 1, 2021
249954f
Update upload-resources-to-github.sh
jayanthvn Dec 1, 2021
ad4b213
Update upload-resources-to-github.sh
jayanthvn Dec 1, 2021
657fb6d
Update upload-resources-to-github.sh
jayanthvn Dec 1, 2021
fbf0674
Update upload-resources-to-github.sh
jayanthvn Dec 1, 2021
b4babc7
Update upload-resources-to-github.sh
jayanthvn Dec 1, 2021
70c7590
Update upload-resources-to-github.sh
jayanthvn Dec 1, 2021
d5c8f79
Update upload-resources-to-github.sh
jayanthvn Dec 1, 2021
5eb80de
aws-vpc-cni-k8s: v1.20.4
jayanthvn Dec 1, 2021
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
26 changes: 26 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: VPC CNI Release

on: [push, pull_request, workflow_dispatch]

env:
DEFAULT_GO_VERSION: ^1.15
GITHUB_TOKEN: ${{ secrets.JAY_GIT_TOKEN }}
GITHUB_USERNAME: ${{ secrets.JAY_GITHUB_USERNAME }}

jobs:

release:
name: Release
runs-on: ubuntu-20.04
if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
steps:
- name: Set up Go 1.x
uses: actions/setup-go@v2
with:
go-version: ${{ env.DEFAULT_GO_VERSION }}

- name: Check out code into the Go module directory
uses: actions/checkout@v2

- name: Attach release artifacts
run: make release
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.10.0
tag: v1.10.26
region: us-west-2
account: "602401143452"
pullPolicy: Always
Expand All @@ -23,7 +23,7 @@ init:

image:
region: us-west-2
tag: v1.10.0
tag: v1.10.26
account: "602401143452"
domain: "amazonaws.com"
pullPolicy: Always
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.10.0
tag: v1.10.26
account: "602401143452"
domain: "amazonaws.com"
# Set to use custom image
Expand Down
4 changes: 2 additions & 2 deletions config/master/aws-k8s-cni-cn.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,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.10.0"
image: "961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni-init:v1.20.4"
env:
- name: DISABLE_TCP_EARLY_DEMUX
value: "false"
Expand All @@ -139,7 +139,7 @@ spec:
{}
containers:
- name: aws-node
image: "961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.10.0"
image: "961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.20.4"
ports:
- containerPort: 61678
name: metrics
Expand Down
4 changes: 2 additions & 2 deletions config/master/aws-k8s-cni-us-gov-east-1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,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.10.0"
image: "151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni-init:v1.20.4"
env:
- name: DISABLE_TCP_EARLY_DEMUX
value: "false"
Expand All @@ -139,7 +139,7 @@ spec:
{}
containers:
- name: aws-node
image: "151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni:v1.10.0"
image: "151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni:v1.20.4"
ports:
- containerPort: 61678
name: metrics
Expand Down
4 changes: 2 additions & 2 deletions config/master/aws-k8s-cni-us-gov-west-1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,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.10.0"
image: "013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni-init:v1.20.4"
env:
- name: DISABLE_TCP_EARLY_DEMUX
value: "false"
Expand All @@ -139,7 +139,7 @@ spec:
{}
containers:
- name: aws-node
image: "013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni:v1.10.0"
image: "013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni:v1.20.4"
ports:
- containerPort: 61678
name: metrics
Expand Down
4 changes: 2 additions & 2 deletions config/master/aws-k8s-cni.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ spec:
hostNetwork: true
initContainers:
- name: aws-vpc-cni-init
image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.10.0"
image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.20.4"
env:
- name: DISABLE_TCP_EARLY_DEMUX
value: "false"
Expand All @@ -139,7 +139,7 @@ spec:
{}
containers:
- name: aws-node
image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.10.0"
image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.20.4"
ports:
- containerPort: 61678
name: metrics
Expand Down
36 changes: 22 additions & 14 deletions config/master/calico-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4903,20 +4903,6 @@ spec:
max: 65535
readOnlyRootFilesystem: false
---
# Source: aws-calico/templates/tigera-operator/02-rolebinding-tigera-operator.yaml
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: tigera-operator
subjects:
- kind: ServiceAccount
name: tigera-operator
namespace: tigera-operator
roleRef:
kind: ClusterRole
name: tigera-operator
apiGroup: rbac.authorization.k8s.io
---
# Source: aws-calico/templates/tigera-operator/02-role-tigera-operator.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
Expand All @@ -4942,6 +4928,14 @@ rules:
- update
- delete
- watch
# EndpointSlices are used for Service-based network policy rule
# enforcement.
- apiGroups: ["discovery.k8s.io"]
resources:
- endpointslices
verbs:
- watch
- list
- apiGroups:
- ""
resources:
Expand Down Expand Up @@ -5111,6 +5105,20 @@ rules:
verbs:
- list
---
# Source: aws-calico/templates/tigera-operator/02-rolebinding-tigera-operator.yaml
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: tigera-operator
subjects:
- kind: ServiceAccount
name: tigera-operator
namespace: tigera-operator
roleRef:
kind: ClusterRole
name: tigera-operator
apiGroup: rbac.authorization.k8s.io
---
# Source: aws-calico/templates/tigera-operator/02-serviceaccount-tigera-operator.yaml
apiVersion: v1
kind: ServiceAccount
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 @@ -90,5 +90,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.10.0"
image: "961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/cni-metrics-helper:v1.20.4"
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 @@ -90,5 +90,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.10.0"
image: "151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/cni-metrics-helper:v1.20.4"
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 @@ -90,5 +90,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.10.0"
image: "013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/cni-metrics-helper:v1.20.4"
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 @@ -90,5 +90,5 @@ spec:
- name: USE_CLOUDWATCH
value: "true"
name: cni-metrics-helper
image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/cni-metrics-helper:v1.10.0"
image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/cni-metrics-helper:v1.20.4"
serviceAccountName: cni-metrics-helper
3 changes: 3 additions & 0 deletions scripts/generate-cni-yaml.sh
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ jq -c '.[]' $REGIONS_FILE | while read i; do
--set init.image.region=$ecrRegion,\
--set init.image.account=$ecrAccount,\
--set init.image.domain=$ecrDomain,\
--set init.image.tag=$VERSION,\
--set image.tag=$VERSION,\
--set image.region=$ecrRegion,\
--set image.account=$ecrAccount,\
--set image.domain=$ecrDomain \
Expand All @@ -87,6 +89,7 @@ jq -c '.[]' $REGIONS_FILE | while read i; do
--set image.region=$ecrRegion,\
--set image.account=$ecrAccount,\
--set image.domain=$ecrDomain \
--set image.tag=$VERSION,\
--namespace $NAMESPACE \
$SCRIPTPATH/../charts/cni-metrics-helper > $NEW_METRICS_RESOURCES_YAML
cat $NEW_METRICS_RESOURCES_YAML | grep -v 'helm.sh\|app.kubernetes.io/managed-by: Helm' > $BUILD_DIR/helm_annotations_removed.yaml
Expand Down
Loading