From 55f780093b0d10e7a55c8ae3e1bdd0fef4d921b3 Mon Sep 17 00:00:00 2001 From: Kingdon Barrett Date: Tue, 26 Sep 2023 12:40:26 -0400 Subject: [PATCH 1/6] tag 2.5.2 Signed-off-by: Kingdon Barrett --- charts/nsqd/Chart.yaml | 2 +- charts/nsqd/values.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/nsqd/Chart.yaml b/charts/nsqd/Chart.yaml index 36b77e1..b7f67d4 100644 --- a/charts/nsqd/Chart.yaml +++ b/charts/nsqd/Chart.yaml @@ -1,6 +1,6 @@ name: nsqd home: https://github.com/teamhephy/nsq -version: +version: 2.5.2 description: A kubernetes based docker image for running nsq daemon. maintainers: - name: Team Hephy diff --git a/charts/nsqd/values.yaml b/charts/nsqd/values.yaml index cc79a50..2756baf 100644 --- a/charts/nsqd/values.yaml +++ b/charts/nsqd/values.yaml @@ -1,6 +1,6 @@ org: "hephy" -pull_policy: "Always" -docker_tag: "canary" +pull_policy: "IfNotPresent" +docker_tag: v2.5.1 # limits_cpu: "100m" # limits_memory: "50Mi" replicas: 1 From f5235e1eb3f3d0956a0da6ff14c8527f8a4a1d6e Mon Sep 17 00:00:00 2001 From: Kingdon Barrett Date: Tue, 26 Sep 2023 13:48:22 -0400 Subject: [PATCH 2/6] match hephy-workflow-beta Signed-off-by: Kingdon Barrett --- charts/nsqd/templates/nsqd-svc.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/charts/nsqd/templates/nsqd-svc.yaml b/charts/nsqd/templates/nsqd-svc.yaml index 5e64cd6..e1aa1f7 100644 --- a/charts/nsqd/templates/nsqd-svc.yaml +++ b/charts/nsqd/templates/nsqd-svc.yaml @@ -6,7 +6,6 @@ metadata: heritage: deis app: deis-nsqd spec: - clusterIP: None ports: - port: {{ .Values.http_port }} name: http From 696beb0d46a57b2fc031c6f15d41d45dd2dd0a79 Mon Sep 17 00:00:00 2001 From: Kingdon Barrett Date: Tue, 26 Sep 2023 13:48:35 -0400 Subject: [PATCH 3/6] tag 2.5.3 Signed-off-by: Kingdon Barrett --- charts/nsqd/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/nsqd/Chart.yaml b/charts/nsqd/Chart.yaml index b7f67d4..63f7589 100644 --- a/charts/nsqd/Chart.yaml +++ b/charts/nsqd/Chart.yaml @@ -1,6 +1,6 @@ name: nsqd home: https://github.com/teamhephy/nsq -version: 2.5.2 +version: 2.5.3 description: A kubernetes based docker image for running nsq daemon. maintainers: - name: Team Hephy From de8154877207f546d807f301a780380448709bf6 Mon Sep 17 00:00:00 2001 From: Kingdon Barrett Date: Tue, 26 Sep 2023 16:33:41 -0400 Subject: [PATCH 4/6] tag 2.5.4 Signed-off-by: Kingdon Barrett --- charts/nsqd/Chart.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/charts/nsqd/Chart.yaml b/charts/nsqd/Chart.yaml index 63f7589..ebcf225 100644 --- a/charts/nsqd/Chart.yaml +++ b/charts/nsqd/Chart.yaml @@ -1,7 +1,8 @@ +apiVersion: v2 name: nsqd home: https://github.com/teamhephy/nsq -version: 2.5.3 +version: 2.5.4 description: A kubernetes based docker image for running nsq daemon. maintainers: - - name: Team Hephy - email: team@teamhephy.com +- name: Team Hephy + email: team@teamhephy.com From 3b0231f9faaf50e1905f20f2b3345d5965ffd481 Mon Sep 17 00:00:00 2001 From: Kingdon Barrett Date: Wed, 27 Sep 2023 12:58:55 -0400 Subject: [PATCH 5/6] [chore] upgrade nsqd-pdb to policy/v1 Signed-off-by: Kingdon Barrett --- charts/nsqd/templates/_helpers.tmpl | 7 +++++++ charts/nsqd/templates/nsqd-pdb.yaml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/charts/nsqd/templates/_helpers.tmpl b/charts/nsqd/templates/_helpers.tmpl index 0a6b41c..3c8640b 100644 --- a/charts/nsqd/templates/_helpers.tmpl +++ b/charts/nsqd/templates/_helpers.tmpl @@ -10,3 +10,10 @@ extensions/v1beta1 apps/v1 {{- end -}} {{- end -}} +{{- define "policyAPIVersion" -}} +{{- if .Capabilities.APIVersions.Has "policy/v1beta1" -}} +policy/v1beta1 +{{- else -}} +policy/v1 +{{- end -}} +{{- end -}} diff --git a/charts/nsqd/templates/nsqd-pdb.yaml b/charts/nsqd/templates/nsqd-pdb.yaml index 5285ffb..f3fd7be 100644 --- a/charts/nsqd/templates/nsqd-pdb.yaml +++ b/charts/nsqd/templates/nsqd-pdb.yaml @@ -1,4 +1,4 @@ -apiVersion: policy/v1beta1 +apiVersion: {{ template "policyAPIVersion" . }} kind: PodDisruptionBudget metadata: name: deis-nsqd From 160db3417490e18db41176acb131aac1a745ce1d Mon Sep 17 00:00:00 2001 From: Kingdon Barrett Date: Wed, 27 Sep 2023 12:59:20 -0400 Subject: [PATCH 6/6] tag 2.5.5 Signed-off-by: Kingdon Barrett --- charts/nsqd/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/nsqd/Chart.yaml b/charts/nsqd/Chart.yaml index ebcf225..125f0a6 100644 --- a/charts/nsqd/Chart.yaml +++ b/charts/nsqd/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: nsqd home: https://github.com/teamhephy/nsq -version: 2.5.4 +version: 2.5.5 description: A kubernetes based docker image for running nsq daemon. maintainers: - name: Team Hephy