-
Notifications
You must be signed in to change notification settings - Fork 90
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
Add 1-30 release branch support #3071
Changes from all commits
40ecec3
fcdf158
fa61151
f1bc57e
3407c0d
07914ce
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -68,6 +68,7 @@ ADDITIONAL_PAUSE_1-26_FROM=1-26 | |
ADDITIONAL_PAUSE_1-27_FROM=1-27 | ||
ADDITIONAL_PAUSE_1-28_FROM=1-28 | ||
ADDITIONAL_PAUSE_1-29_FROM=1-28 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. is there a reason we're still using 1-28 for 1-29 and 1-30? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. So the pauseVersion between 1-28, 1-29 and 1-30 didn't change from 3.9 in Kubernetes. This can be verified by checking the value for different branches 1-28, 1-29 & 1-30. Basically we can use the same value as of 1-28! There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. good explanation! |
||
ADDITIONAL_PAUSE_1-30_FROM=1-28 | ||
|
||
HAS_RELEASE_BRANCHES=true | ||
HAS_LICENSES=false | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
metrics-server-helm-chart-3.11.0 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,106 @@ | ||
From 844bd83b083847ab7d388e2c5037acf111e2d8a0 Mon Sep 17 00:00:00 2001 | ||
From: Jonathan Meier <jwmeier@amazon.com> | ||
Date: Fri, 23 Sep 2022 12:17:23 -0400 | ||
Subject: [PATCH 1/2] Conform helm chart to packages standards | ||
|
||
--- | ||
charts/metrics-server/templates/_helpers.tpl | 2 +- | ||
charts/metrics-server/templates/deployment.yaml | 2 +- | ||
charts/metrics-server/templates/service.yaml | 2 +- | ||
charts/metrics-server/templates/serviceaccount.yaml | 2 +- | ||
charts/metrics-server/templates/servicemonitor.yaml | 2 +- | ||
charts/metrics-server/values.yaml | 10 +++++----- | ||
6 files changed, 10 insertions(+), 10 deletions(-) | ||
|
||
diff --git a/charts/metrics-server/templates/_helpers.tpl b/charts/metrics-server/templates/_helpers.tpl | ||
index 9b87f11..492e462 100644 | ||
--- a/charts/metrics-server/templates/_helpers.tpl | ||
+++ b/charts/metrics-server/templates/_helpers.tpl | ||
@@ -68,7 +68,7 @@ Create the name of the service account to use | ||
The image to use | ||
*/}} | ||
{{- define "metrics-server.image" -}} | ||
-{{- printf "%s:%s" .Values.image.repository (default (printf "v%s" .Chart.AppVersion) .Values.image.tag) }} | ||
+{{- printf "%s/%s@%s" .Values.sourceRegistry .Values.image.repository .Values.image.digest }} | ||
{{- end }} | ||
|
||
{{/* | ||
diff --git a/charts/metrics-server/templates/deployment.yaml b/charts/metrics-server/templates/deployment.yaml | ||
index 1d656fc..e80dc0f 100644 | ||
--- a/charts/metrics-server/templates/deployment.yaml | ||
+++ b/charts/metrics-server/templates/deployment.yaml | ||
@@ -2,7 +2,7 @@ apiVersion: apps/v1 | ||
kind: Deployment | ||
metadata: | ||
name: {{ include "metrics-server.fullname" . }} | ||
- namespace: {{ .Release.Namespace }} | ||
+ namespace: {{ .Release.Namespace | quote }} | ||
labels: | ||
{{- include "metrics-server.labels" . | nindent 4 }} | ||
{{- with .Values.deploymentAnnotations }} | ||
diff --git a/charts/metrics-server/templates/service.yaml b/charts/metrics-server/templates/service.yaml | ||
index d45bcf3..260134c 100644 | ||
--- a/charts/metrics-server/templates/service.yaml | ||
+++ b/charts/metrics-server/templates/service.yaml | ||
@@ -2,7 +2,7 @@ apiVersion: v1 | ||
kind: Service | ||
metadata: | ||
name: {{ include "metrics-server.fullname" . }} | ||
- namespace: {{ .Release.Namespace }} | ||
+ namespace: {{ .Release.Namespace | quote }} | ||
labels: | ||
{{- include "metrics-server.labels" . | nindent 4 }} | ||
{{- with .Values.service.labels -}} | ||
diff --git a/charts/metrics-server/templates/serviceaccount.yaml b/charts/metrics-server/templates/serviceaccount.yaml | ||
index 80ef699..ce3bd0d 100644 | ||
--- a/charts/metrics-server/templates/serviceaccount.yaml | ||
+++ b/charts/metrics-server/templates/serviceaccount.yaml | ||
@@ -3,7 +3,7 @@ apiVersion: v1 | ||
kind: ServiceAccount | ||
metadata: | ||
name: {{ template "metrics-server.serviceAccountName" . }} | ||
- namespace: {{ .Release.Namespace }} | ||
+ namespace: {{ .Release.Namespace | quote }} | ||
labels: | ||
{{- include "metrics-server.labels" . | nindent 4 }} | ||
{{- with .Values.serviceAccount.annotations }} | ||
diff --git a/charts/metrics-server/templates/servicemonitor.yaml b/charts/metrics-server/templates/servicemonitor.yaml | ||
index 5c1c5b7..9e4c9ac 100644 | ||
--- a/charts/metrics-server/templates/servicemonitor.yaml | ||
+++ b/charts/metrics-server/templates/servicemonitor.yaml | ||
@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1 | ||
kind: ServiceMonitor | ||
metadata: | ||
name: {{ include "metrics-server.fullname" . }} | ||
- namespace: {{ .Release.Namespace }} | ||
+ namespace: {{ .Release.Namespace | quote }} | ||
labels: | ||
{{- include "metrics-server.labels" . | nindent 4 }} | ||
{{- with .Values.serviceMonitor.additionalLabels }} | ||
diff --git a/charts/metrics-server/values.yaml b/charts/metrics-server/values.yaml | ||
index fba10aa..38bea8c 100644 | ||
--- a/charts/metrics-server/values.yaml | ||
+++ b/charts/metrics-server/values.yaml | ||
@@ -2,14 +2,14 @@ | ||
# This is a YAML-formatted file. | ||
# Declare variables to be passed into your templates. | ||
|
||
+sourceRegistry: 783794618700.dkr.ecr.us-west-2.amazonaws.com | ||
image: | ||
- repository: registry.k8s.io/metrics-server/metrics-server | ||
- # Overrides the image tag whose default is v{{ .Chart.AppVersion }} | ||
- tag: "" | ||
- pullPolicy: IfNotPresent | ||
+ repository: metrics-server/h1r8a7l5/kubernetes-sigs/metrics-server | ||
+ digest: {{h1r8a7l5/kubernetes-sigs/metrics-server}} | ||
|
||
+ pullPolicy: IfNotPresent | ||
+ | ||
imagePullSecrets: [] | ||
-# - name: registrySecretName | ||
|
||
nameOverride: "" | ||
fullnameOverride: "" | ||
-- | ||
2.39.3 (Apple Git-145) | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is adding these a problem if a 1.30 BR release doesnt exist yet?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I tried to track it in the code, if we need it and checked with @abhay-krishna too. Looks like this is an independent project and there's no dependency with BR release.