Skip to content
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

Jump to bottom

Update _helpers.tpl to avoid nested custom resource label #576

Merged
merged 1 commit into from
Oct 1, 2024
Merged

Update _helpers.tpl to avoid nested custom resource label #576

merged 1 commit into from
Oct 1, 2024

Conversation

VLZZZ
Copy link
Contributor

@VLZZZ VLZZZ commented Oct 1, 2024

What was changed

Remove space trim for set of labels

Why?

See #575

Checklist

  1. Closes [Bug] Custom Resource Labels seems to be broken after 0.45.0 #575

  2. How was this tested:

The issue is no longer reproduced using helm template command

Before:

      labels:
        app.kubernetes.io/component: admintools
        app.kubernetes.io/name: temporal
        helm.sh/chart: temporal-0.45.0
        app.kubernetes.io/managed-by: Helm
        app.kubernetes.io/instance: release-name
        app.kubernetes.io/version: "1.25.0"
        app.kubernetes.io/part-of: temporaltest: infra <------------ ISSUE

After:

      labels:
        app.kubernetes.io/component: admintools
        app.kubernetes.io/name: temporal
        helm.sh/chart: temporal-0.45.0
        app.kubernetes.io/managed-by: Helm
        app.kubernetes.io/instance: release-name
        app.kubernetes.io/version: "1.25.0"
        app.kubernetes.io/part-of: temporal
        test: infra <-------- SOLVED

@VLZZZ VLZZZ requested a review from a team as a code owner October 1, 2024 13:45
@robholland robholland merged commit ed12727 into temporalio:main Oct 1, 2024
3 checks passed
@robholland
Copy link
Contributor

Wish this didn't add a blank line when custom labels aren't set, but I can't see a way around that. Thanks for the fix :)

@VLZZZ VLZZZ deleted the fix-custom-resource-label branch October 2, 2024 08:47
mihaelabalas84 added a commit to fairmoney/temporal-helm-charts that referenced this pull request Oct 2, 2024
@mihaelabalas84 @tsurdilo
@robholland @temporal-data @ktulsyan @ktulsyan-oai @washanhanzi @Blamas @alexshtin @punit-kulal @GerardoMoraSalazar @bakjos @vogre @VLZZZ @cege7480 @grzegorz8 @prathyushpv @sringel @dotdc @bergundy @debugger24 @axfelix @sahilvv @qs-synth @knordman @Alex-Tideman @csabatuz-chess @mananmangal @monotek
Merge latest upstream master into fm-devops (#16)
5503e1e 
* update ui image to 2.25.0 (temporalio#478)

Signed-off-by: Tihomir Surdilovic <[email protected]>

* Allow forcing a specific chart version. (temporalio#479)

This is useful for patch releases on older release lines.

* Update Chart to 0.37.0, Temporal v1.23.1

* Ensure appVersion is used by default as the server image tag. (temporalio#488)

* Bumps server version to the specified appVersion
* Use chart.appversion instead of image.tag from values in deployment spec
* Allow overriding deployment spec with image.tag

---------

Co-authored-by: Kshitij <[email protected]>

* Update Chart to 0.38.1, Temporal v1.23.1

* [Bug] Allow and document configuring Web UI via values.yaml (temporalio#394)

1. remove web ui config in values.yaml
2. remove web config volume in web-deployment.yaml
3. remove web-config config map
4. remove line 280 since the install bash didn't configure web ui auth
5. update the document for web ui configuration with env variable

Co-authored-by: Rob Holland <[email protected]>

* fix(imageTag): Fix default type in values for imageTag (temporalio#489)

* Update Chart to 0.39.0, Temporal v1.24.0

* Update README.md

* Update Chart to 0.39.1, Temporal v1.24.1

* Switch to devrel.

* Support new admintools image tag format (temporalio#493)

* Require tags for server, admintools and ui.

Don't use server tag for admintools, it's versioned separately now.

* Update Chart to 0.40.0.

* fix: add support for pre upgrade. (temporalio#476)

* adding missing ImagePullSecrets section to web deployment

* Whitespace.

* fix: Use visibility server when defining visibility config (temporalio#436)

Co-authored-by: Rob Holland <[email protected]>

* fix: sidecarContainers should be an array, not a dict

* Use tplvalues.render for templating inside values (temporalio#492)

Allow templated values inside the values.yaml for web annotations

* Apply security context regardless of persistence engine. (temporalio#494)

Replaces temporalio#308.

* Update Chart to 0.40.1.

* Allow to skip database creation (temporalio#480)

Signed-off-by: Valentin Zayash <[email protected]>

* Update Cassandra host URLs to remove the ".cluster.local" suffix (temporalio#485)

* Update Cassandra host URLs to remove the ".cluster.local" suffix

* Configure SQL TLS environment variables in server-job (temporalio#411)

* Configure SQL_TLS environment variables in server-job

* Update Chart to 0.41.0.

* Fix weird helm lint false alarm. Fixes temporalio#284.

* Helm 2 compat. Fixes temporalio#187.

* Update codeowners.

* Revert "Update Cassandra host URLs to remove the ".cluster.local" suffix (temporalio#485)" (temporalio#500)

This reverts commit b25c4fc.

* Update Chart to 0.41.1.

* Adds a PodDisruptionBudget and topologySpreadConstraints to web (temporalio#409)

* Adds a PodDisruptionBudget and topologySpreadConstraints to web

* fixing type on topologySpreadConstraints
topologySpreadConstraints should be a list instead of map

* Update Chart to 0.42.0.

* Update README to mention you cannot do Cassandra only anymore. (temporalio#499)

Related: temporalio#470.

* Remove invalid line. (temporalio#502)

Fixes temporalio#426

* Service account should be set when present, even if not creating. (temporalio#498)

Fixes temporalio#403.

* Correct outdated port config. (temporalio#497)

Fixes temporalio#333 and temporalio#149.

Context: temporalio/temporal#650

* Update Chart to 0.43.0.

* ElasticSearch -> Elasticsearch

* fix: Escape ES credentials (temporalio#505)

* feat: updated grafana and prometheus helm dependencies (temporalio#424)

* feat: bump grafana and prometheus charts versions

Signed-off-by: David Calvert <[email protected]>

* Remove hard coded cluster.local references. (temporalio#501)

Switch check-cassandra-service init container to use nc. nslookup in recent
busybox images is broken and doesn't obey resolv.conf, meaning it won't check
k8s search domains.

* Enable HTTP API for Nexus (temporalio#511)

* Enable HTTP API for Nexus

* Update charts/temporal/templates/server-service.yaml

* Add FE Ingress (temporalio#435)

* Add ingress for frontend

* Add CONTRIBUTING.

* Note contributing in README.

* Note slack channel.

* Use a shared config map for all services. (temporalio#514)

Remove helpers in favour of defaults via values file.
Remove unused Elasticsearch environment variables.
Stop switching between es-visibility and visibility for store names.

* Pass `ct lint`

* Lint chart on PR.

* Setup for `ci install`. (temporalio#522)

* Setup for `ci install`.

Adds a test so that `helm test` now checks that the cluster is healthy after
the system is deployed.

Refactors server-job to remove the use of helm hooks which cause lot of users
pain and don't work with --wait, or the mechanism that helm test uses.

Improve the handling of elasticsearch by treating it just like the other drivers.

Correctly handle the schema.createDatabase setting which previously had edge cases.

* Secret key fixes.

* Fix missed ES quoting issue.

* Add postgres-es test.

* Fix branch reference.

* Update Chart to 0.44.0.

* Update README to use repo. (temporalio#531)

* Update README to use repo.

Fixes temporalio#458

---------

Co-authored-by: Alex Garnett <[email protected]>

* Check for pgx driver as well as plain postgres. (temporalio#546)

Fixes temporalio#532

* Templatize resourceLabels for standardization (temporalio#539)

* Templatize resourceLabels for standardization

* Feat add authorization options (temporalio#542)

Server authorization config.

* Quote sql password for default store in the same way as the visibility store (temporalio#551)

* Update Chart to 0.45.0.

* Update Chart to 0.45.1.

* Update UI version description (temporalio#556)

* Use admintools-env and secret for ES password consistent with e.g. jobs (temporalio#530)

* Provide option to create default namespace (temporalio#550)

* Provide option to create default namespace
* Create multiple namespaces with optional retention
---------

Co-authored-by: Manan Mangal <[email protected]>

* add Job annotations and labels (temporalio#536)

* add job labels and annotations

Signed-off-by: André Bauer <[email protected]>
Co-authored-by: Rob Holland <[email protected]>

---------

Signed-off-by: André Bauer <[email protected]>
Co-authored-by: Rob Holland <[email protected]>

* Config to specify tags to be excluded in prometheus metrics (temporalio#566)

* Config to specify tags to be excluded in prometheus metrics

---------

Co-authored-by: Rob Holland <[email protected]>

* Update Chart to 0.46.0.

* Ensure we use global for includes. (temporalio#568)

Some call sites used . which was sometimes not the global context.

* Update Chart to 0.46.1.

* Update _helpers.tpl to avoid nested custom resource label (temporalio#576)

* Update Chart to 0.46.2.

* fix identation

---------

Signed-off-by: Tihomir Surdilovic <[email protected]>
Signed-off-by: Valentin Zayash <[email protected]>
Signed-off-by: David Calvert <[email protected]>
Signed-off-by: André Bauer <[email protected]>
Co-authored-by: Tihomir Surdilovic <[email protected]>
Co-authored-by: Rob Holland <[email protected]>
Co-authored-by: Temporal Data <[email protected]>
Co-authored-by: Kshitij Tulsyan <[email protected]>
Co-authored-by: Kshitij <[email protected]>
Co-authored-by: Jingyu <[email protected]>
Co-authored-by: Theo REY <[email protected]>
Co-authored-by: Alex Shtin <[email protected]>
Co-authored-by: Rob Holland <[email protected]>
Co-authored-by: Punit Kulal <[email protected]>
Co-authored-by: Gerardo Enrique Mora Salazar <[email protected]>
Co-authored-by: Giovanny Gutiérrez <[email protected]>
Co-authored-by: vogre <[email protected]>
Co-authored-by: Valentin Zayash <[email protected]>
Co-authored-by: Chris Taylor <[email protected]>
Co-authored-by: Grzegorz Kołakowski <[email protected]>
Co-authored-by: Prathyush PV <[email protected]>
Co-authored-by: sringel <[email protected]>
Co-authored-by: Alex Shtin <[email protected]>
Co-authored-by: David Calvert <[email protected]>
Co-authored-by: Roey Berman <[email protected]>
Co-authored-by: Rahul Kumar <[email protected]>
Co-authored-by: Alex Garnett <[email protected]>
Co-authored-by: Sahil Vazirani <[email protected]>
Co-authored-by: Quinn <[email protected]>
Co-authored-by: Kristian Nordman <[email protected]>
Co-authored-by: Alex Tideman <[email protected]>
Co-authored-by: Csaba Tűz <[email protected]>
Co-authored-by: Manan Mangal <[email protected]>
Co-authored-by: Manan Mangal <[email protected]>
Co-authored-by: André Bauer <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@robholland robholland robholland approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Bug] Custom Resource Labels seems to be broken after 0.45.0
2 participants
@VLZZZ @robholland