Skip to content

Add image registry support for CNI metrics helper #1336

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.

Sign up for GitHub

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

Open
robertlestak wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add image registry support for CNI metrics helper #1336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion stable/cni-metrics-helper/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: cni-metrics-helper
version: 1.21.2
version: 1.21.3
appVersion: v1.21.2
description: A Helm chart for the AWS VPC CNI Metrics Helper
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
Expand Down
2 changes: 2 additions & 0 deletions stable/cni-metrics-helper/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ 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.21.2` |
| `image.registry` | Image registry/repository path without the tag | `nil` |
| `image.override` | Full image override | `nil` |
| `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
13 changes: 13 additions & 0 deletions stable/cni-metrics-helper/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,16 @@ Create the name of the service account to use
{{- default "default" .Values.serviceAccount.name }}
{{- end }}
{{- end }}

{{/*
The cni-metrics-helper image to use
*/}}
{{- define "cni-metrics-helper.image" -}}
{{- if .Values.image.override -}}
{{- .Values.image.override -}}
{{- else if .Values.image.registry -}}
{{- printf "%s:%s" .Values.image.registry .Values.image.tag -}}
{{- else -}}
{{- printf "%s.dkr.ecr.%s.%s/cni-metrics-helper:%s" .Values.image.account .Values.image.region .Values.image.domain .Values.image.tag -}}
{{- end -}}
{{- end }}
4 changes: 2 additions & 2 deletions stable/cni-metrics-helper/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ spec:
securityContext: {{ toYaml .Values.containerSecurityContext | nindent 10 }}
{{- end }}
name: cni-metrics-helper
image: "{{- if .Values.image.override }}{{- .Values.image.override }}{{- else }}{{- .Values.image.account }}.dkr.ecr.{{- .Values.image.region }}.{{- .Values.image.domain }}/cni-metrics-helper:{{- .Values.image.tag }}{{- end}}"
image: "{{ include "cni-metrics-helper.image" . }}"
{{- if eq (get .Values.env "USE_PROMETHEUS") "true" }}
ports:
- containerPort: 61681
Expand All @@ -65,4 +65,4 @@ spec:
{{- with .Values.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
2 changes: 2 additions & 0 deletions stable/cni-metrics-helper/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ image:
tag: v1.21.2
account: "602401143452"
domain: "amazonaws.com"
registry:
# registry: "repo/org/image"
# Set to use custom image
# override: "repo/org/image:tag"

Expand Down