Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove legacy Giant Swarm monitoring Service and labels
Browse files Browse the repository at this point in the history
ubergesundheit committed Jan 24, 2025

Verified

This commit was signed with the committer’s verified signature.
ubergesundheit Gerald Pape
1 parent c14e2d4 commit 7c0bfc5
Showing 10 changed files with 10 additions and 106 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -14,6 +14,10 @@ and this project's packages adheres to [Semantic Versioning](http://semver.org/s
- Revert `ingressController.admissionWebhook` settings to upstream values. (Enabled by default with `failurePolicy: Ignore`)
- Update Kong Gateway image to `3.8.1.0-debian`

### Removed

- Legacy Giant Swarm metrics Service and labels

## [4.4.0] - 2024-08-19

### Changed
7 changes: 3 additions & 4 deletions diffs/helm__kong-app__templates___helpers.tpl.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/vendor/kong/charts/kong/templates/_helpers.tpl b/helm/kong-app/templates/_helpers.tpl
index 92f728c..a4dc243 100644
index 92f728c..7c9178c 100644
--- a/vendor/kong/charts/kong/templates/_helpers.tpl
+++ b/helm/kong-app/templates/_helpers.tpl
@@ -25,24 +25,40 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
@@ -25,24 +25,39 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}

@@ -23,7 +23,6 @@ index 92f728c..a4dc243 100644
{{ $version := semver (include "kong.effectiveVersion" .Values.image) }}
app.kubernetes.io/version: {{ printf "%d.%d" $version.Major $version.Minor | quote }}
+giantswarm.io/service-type: "managed"
+giantswarm.io/monitoring_basic_sli: "true"
+application.giantswarm.io/team: {{ index .Chart.Annotations "application.giantswarm.io/team" | quote }}
+application.giantswarm.io/container-images-hash: {{ include "kong.imagesHash" . | quote }}
{{- range $key, $value := .Values.extraLabels }}
@@ -45,7 +44,7 @@ index 92f728c..a4dc243 100644
{{- define "kong.postgresql.fullname" -}}
{{- $name := default "postgresql" .Values.postgresql.nameOverride -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
@@ -1286,9 +1302,13 @@ Environment variables are sorted alphabetically
@@ -1286,9 +1301,13 @@ Environment variables are sorted alphabetically
{{- if .unifiedRepoTag }}
{{- .unifiedRepoTag }}
{{- else if .repository }}
Empty file.
1 change: 0 additions & 1 deletion helm/kong-app/templates/_helpers.tpl
Original file line number Diff line number Diff line change
@@ -41,7 +41,6 @@ app.kubernetes.io/managed-by: "{{ .Release.Service }}"
{{ $version := semver (include "kong.effectiveVersion" .Values.image) }}
app.kubernetes.io/version: {{ printf "%d.%d" $version.Major $version.Minor | quote }}
giantswarm.io/service-type: "managed"
giantswarm.io/monitoring_basic_sli: "true"
application.giantswarm.io/team: {{ index .Chart.Annotations "application.giantswarm.io/team" | quote }}
application.giantswarm.io/container-images-hash: {{ include "kong.imagesHash" . | quote }}
{{- range $key, $value := .Values.extraLabels }}
35 changes: 0 additions & 35 deletions helm/kong-app/templates/service-kong-metrics.yaml

This file was deleted.

7 changes: 3 additions & 4 deletions sync/patches/gs-helpers/_helpers.tpl.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git b/helm/kong-app/templates/_helpers.tpl a/helm/kong-app/templates/_helpers.tpl
index d720e4d..6d72907 100644
index 92f728c..7c9178c 100644
--- b/helm/kong-app/templates/_helpers.tpl
+++ a/helm/kong-app/templates/_helpers.tpl
@@ -25,24 +25,40 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
@@ -25,24 +25,39 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}

@@ -23,7 +23,6 @@ index d720e4d..6d72907 100644
{{ $version := semver (include "kong.effectiveVersion" .Values.image) }}
app.kubernetes.io/version: {{ printf "%d.%d" $version.Major $version.Minor | quote }}
+giantswarm.io/service-type: "managed"
+giantswarm.io/monitoring_basic_sli: "true"
+application.giantswarm.io/team: {{ index .Chart.Annotations "application.giantswarm.io/team" | quote }}
+application.giantswarm.io/container-images-hash: {{ include "kong.imagesHash" . | quote }}
{{- range $key, $value := .Values.extraLabels }}
@@ -45,7 +44,7 @@ index d720e4d..6d72907 100644
{{- define "kong.postgresql.fullname" -}}
{{- $name := default "postgresql" .Values.postgresql.nameOverride -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
@@ -1286,9 +1302,13 @@ Environment variables are sorted alphabetically
@@ -1286,9 +1301,13 @@ Environment variables are sorted alphabetically
{{- if .unifiedRepoTag }}
{{- .unifiedRepoTag }}
{{- else if .repository }}
9 changes: 0 additions & 9 deletions sync/patches/servicemonitor/README.md

This file was deleted.

17 changes: 0 additions & 17 deletions sync/patches/servicemonitor/patch.sh

This file was deleted.

35 changes: 0 additions & 35 deletions sync/patches/servicemonitor/service-kong-metrics.yaml

This file was deleted.

1 change: 0 additions & 1 deletion sync/sync.sh
Original file line number Diff line number Diff line change
@@ -17,7 +17,6 @@ vendir sync
./sync/patches/values-schema/patch.sh
./sync/patches/affinity-topologyspreadconstraints/patch.sh
./sync/patches/psp/patch.sh
./sync/patches/servicemonitor/patch.sh
./sync/patches/gs-helpers/patch.sh
./sync/patches/vpa/patch.sh
./sync/patches/helmignore/patch.sh

0 comments on commit 7c0bfc5

Please sign in to comment.