Skip to content

Commit 01c4ad5

Browse files
jaydeokarjaydeokar
authored
Merge pull request #3456 from aws/master
Merge from master to release-1.20
2 parents dc68ced + 445ade9 commit 01c4ad5

34 files changed

+982
-357
lines changed

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Changelog
22

3+
## v1.20.3
4+
5+
* chore: update VPC IP resource limits by @github-actions[bot] in https://github.com/aws/amazon-vpc-cni-k8s/pull/3441
6+
* chore: update VPC IP resource limits by @github-actions[bot] in https://github.com/aws/amazon-vpc-cni-k8s/pull/3453
7+
* Optionally setting up Route table for non zero Network Cards if AMI is already configuring at bootup by @jaydeokar in https://github.com/aws/amazon-vpc-cni-k8s/pull/3452
8+
* Add overrideRepository images option by @QuentinBtd in https://github.com/aws/amazon-vpc-cni-k8s/pull/3435
9+
* Initialize controller-runtime logger by @dcoppa in https://github.com/aws/amazon-vpc-cni-k8s/pull/3443
10+
311
## v1.20.2
412
* Bump github.com/samber/lo from 1.49.1 to 1.51.0 by @dependabot[bot] in https://github.com/aws/amazon-vpc-cni-k8s/pull/3386
513
* Bump github.com/prometheus/client_model from 0.6.1 to 0.6.2 by @dependabot[bot] in https://github.com/aws/amazon-vpc-cni-k8s/pull/3385

‎charts/aws-vpc-cni/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v1
22
name: aws-vpc-cni
3-
version: 1.20.2
4-
appVersion: "v1.20.2"
3+
version: 1.20.3
4+
appVersion: "v1.20.3"
55
description: A Helm chart for the AWS VPC CNI
66
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
77
home: https://github.com/aws/amazon-vpc-cni-k8s

‎charts/aws-vpc-cni/README.md‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,20 +48,22 @@ The following table lists the configurable parameters for this chart and their d
4848
| `minimumWindowsIPTarget`| Minimum IP target value for Windows prefix delegation | `3` |
4949
| `branchENICooldown` | Number of seconds that branch ENIs remain in cooldown | `60` |
5050
| `fullnameOverride` | Override the fullname of the chart | `aws-node` |
51-
| `image.tag` | Image tag | `v1.20.2` |
51+
| `image.tag` | Image tag | `v1.20.3` |
5252
| `image.domain` | ECR repository domain | `amazonaws.com` |
5353
| `image.region` | ECR repository region to use. Should match your cluster | `us-west-2` |
5454
| `image.endpoint` | ECR repository endpoint to use. | `ecr` |
5555
| `image.account` | ECR repository account number | `602401143452` |
5656
| `image.pullPolicy` | Container pull policy | `IfNotPresent` |
57+
| `image.overrideRepository` | Repository override for the image (does not change the tag) | `nil` |
5758
| `image.override` | A custom docker image to use | `nil` |
5859
| `imagePullSecrets` | Docker registry pull secret | `[]` |
59-
| `init.image.tag` | Image tag | `v1.20.2` |
60+
| `init.image.tag` | Image tag | `v1.20.3` |
6061
| `init.image.domain` | ECR repository domain | `amazonaws.com` |
6162
| `init.image.region` | ECR repository region to use. Should match your cluster | `us-west-2` |
6263
| `init.image.endpoint` | ECR repository endpoint to use. | `ecr` |
6364
| `init.image.account` | ECR repository account number | `602401143452` |
6465
| `init.image.pullPolicy` | Container pull policy | `IfNotPresent` |
66+
| `init.image.overrideRepository` | Repository override for the image (does not change the tag) | `nil` |
6567
| `init.image.override` | A custom docker image to use | `nil` |
6668
| `init.env` | List of init container environment variables. See [here](https://github.com/aws/amazon-vpc-cni-k8s#cni-configuration-variables) for options | (see `values.yaml`) |
6769
| `init.securityContext` | Init container Security context | `privileged: true` |
@@ -75,9 +77,11 @@ The following table lists the configurable parameters for this chart and their d
7577
| `nodeAgent.image.endpoint` | ECR repository endpoint to use. | `ecr` |
7678
| `nodeAgent.image.account` | ECR repository account number | `602401143452` |
7779
| `nodeAgent.image.pullPolicy` | Container pull policy | `IfNotPresent` |
80+
| `nodeAgent.image.overrideRepository` | Repository override for the image (does not change the tag) | `nil` |
81+
| `nodeAgent.image.override` | A custom docker image to use | `nil` |
7882
| `nodeAgent.securityContext` | Node Agent container Security context | `capabilities: add: - "NET_ADMIN" privileged: true` |
7983
| `nodeAgent.enableCloudWatchLogs` | Enable CW logging for Node Agent | `false` |
80-
`nodeAgent.networkPolicyAgentLogFileLocation` | Log File location of Network Policy Agent | `/var/log/aws-routed-eni/network-policy-agent.log` |
84+
| `nodeAgent.networkPolicyAgentLogFileLocation` | Log File location of Network Policy Agent | `/var/log/aws-routed-eni/network-policy-agent.log` |
8185
| `nodeAgent.enablePolicyEventLogs` | Enable policy decision logs for Node Agent | `false` |
8286
| `nodeAgent.metricsBindAddr` | Node Agent port for metrics | `8162` |
8387
| `nodeAgent.healthProbeBindAddr` | Node Agent port for health probes | `8163` |

‎charts/aws-vpc-cni/templates/_helpers.tpl‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ The aws-vpc-cni-init image to use
6262
{{- define "aws-vpc-cni.initImage" -}}
6363
{{- if .Values.init.image.override }}
6464
{{- .Values.init.image.override }}
65+
{{- else if .Values.init.image.overrideRepository }}
66+
{{- printf "%s:%s" .Values.init.image.overrideRepository .Values.init.image.tag }}
6567
{{- else }}
6668
{{- printf "%s.dkr.%s.%s.%s/amazon-k8s-cni-init:%s" .Values.init.image.account .Values.init.image.endpoint .Values.init.image.region .Values.init.image.domain .Values.init.image.tag }}
6769
{{- end }}
@@ -73,6 +75,8 @@ The aws-vpc-cni image to use
7375
{{- define "aws-vpc-cni.image" -}}
7476
{{- if .Values.image.override }}
7577
{{- .Values.image.override }}
78+
{{- else if .Values.image.overrideRepository }}
79+
{{- printf "%s:%s" .Values.image.overrideRepository .Values.image.tag }}
7680
{{- else }}
7781
{{- printf "%s.dkr.%s.%s.%s/amazon-k8s-cni:%s" .Values.image.account .Values.image.endpoint .Values.image.region .Values.image.domain .Values.image.tag }}
7882
{{- end }}
@@ -84,6 +88,8 @@ The aws-network-policy-agent image to use
8488
{{- define "aws-vpc-cni.nodeAgentImage" -}}
8589
{{- if .Values.nodeAgent.image.override }}
8690
{{- .Values.nodeAgent.image.override }}
91+
{{- else if .Values.nodeAgent.image.overrideRepository }}
92+
{{- printf "%s:%s" .Values.nodeAgent.image.overrideRepository .Values.nodeAgent.image.tag }}
8793
{{- else }}
8894
{{- printf "%s.dkr.%s.%s.%s/amazon/aws-network-policy-agent:%s" .Values.nodeAgent.image.account .Values.nodeAgent.image.endpoint .Values.nodeAgent.image.region .Values.nodeAgent.image.domain .Values.nodeAgent.image.tag }}
8995
{{- end -}}

‎charts/aws-vpc-cni/values.yaml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@ nameOverride: aws-node
88

99
init:
1010
image:
11-
tag: v1.20.2
11+
tag: v1.20.3
1212
domain: amazonaws.com
1313
region: us-west-2
1414
endpoint: ecr
1515
account: "602401143452"
1616
pullPolicy: Always
1717
# Set to use custom image
18+
overrideRepository:
19+
# overrideRepository: "repo/org/image"
1820
override:
1921
# override: "repo/org/image:tag"
2022
env:
@@ -34,6 +36,8 @@ nodeAgent:
3436
account: "602401143452"
3537
pullPolicy: Always
3638
# Set to use custom image
39+
overrideRepository:
40+
# overrideRepository: "repo/org/image"
3741
override:
3842
# override: "repo/org/image:tag"
3943
securityContext:
@@ -52,13 +56,15 @@ nodeAgent:
5256
resources: {}
5357

5458
image:
55-
tag: v1.20.2
59+
tag: v1.20.3
5660
domain: amazonaws.com
5761
region: us-west-2
5862
endpoint: ecr
5963
account: "602401143452"
6064
pullPolicy: Always
6165
# Set to use custom image
66+
overrideRepository:
67+
# overrideRepository: "repo/org/image"
6268
override:
6369
# override: "repo/org/image:tag"
6470

@@ -86,7 +92,7 @@ env:
8692
ENABLE_IPv4: "true"
8793
ENABLE_IPv6: "false"
8894
ENABLE_SUBNET_DISCOVERY: "true"
89-
VPC_CNI_VERSION: "v1.20.2"
95+
VPC_CNI_VERSION: "v1.20.3"
9096
NETWORK_POLICY_ENFORCING_MODE: "standard"
9197
ENABLE_IMDS_ONLY_MODE: "false"
9298
ENABLE_MULTI_NIC: "false"

‎charts/cni-metrics-helper/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
22
name: cni-metrics-helper
3-
version: 1.20.2
4-
appVersion: v1.20.2
3+
version: 1.20.3
4+
appVersion: v1.20.3
55
description: A Helm chart for the AWS VPC CNI Metrics Helper
66
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
77
home: https://github.com/aws/amazon-vpc-cni-k8s

‎charts/cni-metrics-helper/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ The following table lists the configurable parameters for this chart and their d
6060
| -------------------------------|---------------------------------------------------------------|-------------------------------------|
6161
| `affinity` | Map of node/pod affinities | `{}` |
6262
| `fullnameOverride` | Override the fullname of the chart | `cni-metrics-helper` |
63-
| `image.tag` | Image tag | `v1.20.2` |
63+
| `image.tag` | Image tag | `v1.20.3` |
6464
| `image.domain` | ECR repository domain | `amazonaws.com` |
6565
| `image.region` | ECR repository region to use. Should match your cluster | `us-west-2` |
6666
| `image.account` | ECR repository account number | `602401143452` |

‎charts/cni-metrics-helper/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ nameOverride: cni-metrics-helper
44

55
image:
66
region: us-west-2
7-
tag: v1.20.2
7+
tag: v1.20.3
88
account: "602401143452"
99
domain: "amazonaws.com"
1010
# Set to use custom image

‎cmd/aws-k8s-agent/main.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import (
2929
metrics "github.com/aws/amazon-vpc-cni-k8s/utils/prometheusmetrics"
3030
"k8s.io/apimachinery/pkg/util/wait"
3131
"k8s.io/client-go/kubernetes"
32+
ctrl "sigs.k8s.io/controller-runtime"
3233
)
3334

3435
const (
@@ -97,6 +98,10 @@ func _main() int {
9798
// Do not add anything before initializing logger
9899
log := logger.Get()
99100

101+
// Initialize controller-runtime logger
102+
logConfig := logger.LoadLogConfig()
103+
ctrl.SetLogger(logConfig.NewControllerRuntimeLogger())
104+
100105
log.Infof("Starting L-IPAMD %s ...", version.Version)
101106
version.RegisterMetric()
102107

‎cmd/cni-metrics-helper/main.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import (
3030
"github.com/aws/amazon-vpc-cni-k8s/pkg/k8sapi"
3131
"github.com/aws/amazon-vpc-cni-k8s/pkg/publisher"
3232
"github.com/aws/amazon-vpc-cni-k8s/utils/prometheusmetrics"
33+
ctrl "sigs.k8s.io/controller-runtime"
3334
)
3435

3536
const (
@@ -67,6 +68,10 @@ func main() {
6768
LogLocation: "stdout",
6869
}
6970
log := logger.New(&logConfig)
71+
72+
// Initialize controller-runtime logger
73+
ctrl.SetLogger(logConfig.NewControllerRuntimeLogger())
74+
7075
options := &options{}
7176
flags := pflag.NewFlagSet("", pflag.ExitOnError)
7277
flags.AddGoFlagSet(flag.CommandLine)

0 commit comments

Comments
 (0)