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.

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

fix(argo-cd): Fixed default tls hosts for grpc ingress endpoint #2580

Merged
merged 5 commits into from Mar 11, 2024

Conversation

groundhog2k
Copy link
Contributor

@groundhog2k groundhog2k commented Mar 11, 2024

The default tls hosts entry for ingress must match the default ingress rules host - which can be .Values.server.ingressGrpc.hostname or $hostname when nothing else was specified.

Example to reproduce this bug:

Create a server with 2 ingresses (for argocd ui and grpc):

global:
  domain: "argocd.k8s.local"

server:
  ingress:
    enabled: true

    annotations:
      cert-manager.io/cluster-issuer: blablabla

    tls: true
    hostname: "argocd.k8s.local"

  ingressGrpc:
    enabled: true
    annotations:
      cert-manager.io/cluster-issuer: blablabla
      nginx.ingress.kubernetes.io/backend-protocol: "GRPC"

    tls: true
    hostname: "argocd-grpc.k8s.local"

The Argo CD UI ingress endpoint is correct.

The GRPC ingress endpoint will be rendered with wrong tls hosts path (grpc.argocd.k8s.local
instead of argocd-grpc.k8s.local).

The PR will fix this problem.


Checklist:

  • I have bumped the chart version according to versioning
  • I have updated the documentation according to documentation
  • I have updated the chart changelog with all the changes that come with this pull request according to changelog.
  • Any new values are backwards compatible and/or have sensible default.
  • I have signed off all my commits as required by DCO.
  • My build is green (troubleshooting builds).

@groundhog2k groundhog2k changed the title Fixed default tls hosts for grpc ingress endpoint Fix: Fixed default tls hosts for grpc ingress endpoint Mar 11, 2024
@groundhog2k groundhog2k changed the title Fix: Fixed default tls hosts for grpc ingress endpoint fix: Fixed default tls hosts for grpc ingress endpoint Mar 11, 2024
@groundhog2k groundhog2k changed the title fix: Fixed default tls hosts for grpc ingress endpoint fix: Fixed default tls hosts for grpc ingress endpoint / scope: argo-cd Mar 11, 2024
@groundhog2k groundhog2k changed the title fix: Fixed default tls hosts for grpc ingress endpoint / scope: argo-cd fix(argo-cd): Fixed default tls hosts for grpc ingress endpoint Mar 11, 2024
charts/argo-cd/Chart.yaml Outdated Show resolved Hide resolved
groundhog2k and others added 4 commits March 11, 2024 14:37
Signed-off-by: Goeran Poehner <goeran.poehner@gmail.com>
Signed-off-by: Goeran Poehner <goeran.poehner@gmail.com>
Signed-off-by: Goeran Poehner <goeran.poehner@gmail.com>
Signed-off-by: Goeran Poehner <goeran.poehner@gmail.com>
@mkilchhofer
Copy link
Member

@pdrastil can I have your eyes on this as you refactored the whole Ingress piece? :-)

@pdrastil
Copy link
Member

LGTM - thanks for extra fallback

Signed-off-by: Petr Drastil <petr.drastil@gmail.com>
@pdrastil pdrastil merged commit 6a58945 into argoproj:main Mar 11, 2024
6 checks passed
hobroker pushed a commit to hobroker/selfhosted that referenced this pull request Mar 26, 2024
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [argo-cd](https://togithub.com/argoproj/argo-helm) | minor | `6.6.0`
-> `6.7.3` |
| [reloader](https://togithub.com/stakater/Reloader) | patch | `1.0.67`
-> `1.0.71` |
| [traefik](https://traefik.io/)
([source](https://togithub.com/traefik/traefik-helm-chart)) | minor |
`26.0.0` -> `26.1.0` |

---

### Release Notes

<details>
<summary>argoproj/argo-helm (argo-cd)</summary>

###
[`v6.7.3`](https://togithub.com/argoproj/argo-helm/releases/tag/argo-cd-6.7.3)

[Compare
Source](https://togithub.com/argoproj/argo-helm/compare/argo-cd-6.7.2...argo-cd-6.7.3)

A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool
for Kubernetes.

#### What's Changed

- chore(deps): update renovatebot/github-action action to v40.1.5 by
[@&#8203;argoproj-renovate](https://togithub.com/argoproj-renovate) in
[argoproj/argo-helm#2584
- chore(deps): bump actions/checkout from 4.1.1 to 4.1.2 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[argoproj/argo-helm#2587
- chore(deps): bump docker/login-action from 3.0.0 to 3.1.0 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[argoproj/argo-helm#2586
- chore(argo-cd): Update dependency argoproj/argo-cd to v2.10.4 by
[@&#8203;argoproj-renovate](https://togithub.com/argoproj-renovate) in
[argoproj/argo-helm#2588

**Full Changelog**:
argoproj/argo-helm@argo-cd-6.7.2...argo-cd-6.7.3

###
[`v6.7.2`](https://togithub.com/argoproj/argo-helm/releases/tag/argo-cd-6.7.2)

[Compare
Source](https://togithub.com/argoproj/argo-helm/compare/argo-cd-6.7.1...argo-cd-6.7.2)

A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool
for Kubernetes.

#### What's Changed

- chore(deps): update actions/checkout action to v4.1.2 by
[@&#8203;argoproj-renovate](https://togithub.com/argoproj-renovate) in
[argoproj/argo-helm#2582
- chore(argo-cd): Update dependency argoproj/argo-cd to v2.10.3 by
[@&#8203;argoproj-renovate](https://togithub.com/argoproj-renovate) in
[argoproj/argo-helm#2583

**Full Changelog**:
argoproj/argo-helm@argo-cd-6.7.1...argo-cd-6.7.2

###
[`v6.7.1`](https://togithub.com/argoproj/argo-helm/releases/tag/argo-cd-6.7.1)

[Compare
Source](https://togithub.com/argoproj/argo-helm/compare/argo-cd-6.7.0...argo-cd-6.7.1)

A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool
for Kubernetes.

#### What's Changed

- fix(argo-cd): Fixed default tls hosts for grpc ingress endpoint by
[@&#8203;groundhog2k](https://togithub.com/groundhog2k) in
[argoproj/argo-helm#2580

#### New Contributors

- [@&#8203;groundhog2k](https://togithub.com/groundhog2k) made their
first contribution in
[argoproj/argo-helm#2580

**Full Changelog**:
argoproj/argo-helm@argo-cd-6.7.0...argo-cd-6.7.1

###
[`v6.7.0`](https://togithub.com/argoproj/argo-helm/releases/tag/argo-cd-6.7.0)

[Compare
Source](https://togithub.com/argoproj/argo-helm/compare/argo-cd-6.6.0...argo-cd-6.7.0)

A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool
for Kubernetes.

#### What's Changed

- chore(deps): update renovatebot/github-action action to v40.1.3 by
[@&#8203;argoproj-renovate](https://togithub.com/argoproj-renovate) in
[argoproj/argo-helm#2573
- chore(deps): update renovatebot/github-action action to v40.1.4 by
[@&#8203;argoproj-renovate](https://togithub.com/argoproj-renovate) in
[argoproj/argo-helm#2579
- feat(argo-cd): Support setting ArgoCD Notifications secret by
[@&#8203;ranrubin](https://togithub.com/ranrubin) in
[argoproj/argo-helm#2577

#### New Contributors

- [@&#8203;ranrubin](https://togithub.com/ranrubin) made their first
contribution in
[argoproj/argo-helm#2577

**Full Changelog**:
argoproj/argo-helm@argo-workflows-0.40.14...argo-cd-6.7.0

</details>

<details>
<summary>stakater/Reloader (reloader)</summary>

###
[`v1.0.71`](https://togithub.com/stakater/Reloader/releases/tag/v1.0.71)

[Compare
Source](https://togithub.com/stakater/Reloader/compare/v1.0.70...v1.0.71)

#### Changelog

- [`221369b`](https://togithub.com/stakater/Reloader/commit/221369b) Add
make target to remove labels and annotations from manifests
- [`e615478`](https://togithub.com/stakater/Reloader/commit/e615478)
Merge branch 'master' into fix-621
- [`ea12d91`](https://togithub.com/stakater/Reloader/commit/ea12d91)
Merge branch 'master' into fix-621
- [`6a6307a`](https://togithub.com/stakater/Reloader/commit/6a6307a)
Merge pull request
[#&#8203;625](https://togithub.com/stakater/Reloader/issues/625) from
bnallapeta/fix-621
- [`08b02e0`](https://togithub.com/stakater/Reloader/commit/08b02e0)
Remove labels and annotations from Kubernetes deployment.yaml
- [`352f6ff`](https://togithub.com/stakater/Reloader/commit/352f6ff)
Update deployment.yaml with reloader-reloader labels and selector
- [`f8b425a`](https://togithub.com/stakater/Reloader/commit/f8b425a)
\[skip-ci] Update artifacts

###
[`v1.0.70`](https://togithub.com/stakater/Reloader/releases/tag/v1.0.70)

[Compare
Source](https://togithub.com/stakater/Reloader/compare/v1.0.69...v1.0.70)

#### Changelog

- [`3a07584`](https://togithub.com/stakater/Reloader/commit/3a07584)
Merge branch 'master' into vpa
- [`c69ce74`](https://togithub.com/stakater/Reloader/commit/c69ce74)
Merge branch 'master' into vpa
- [`920c5d2`](https://togithub.com/stakater/Reloader/commit/920c5d2)
Merge pull request
[#&#8203;611](https://togithub.com/stakater/Reloader/issues/611) from
t3mi/vpa
- [`43d7836`](https://togithub.com/stakater/Reloader/commit/43d7836)
\[skip-ci] Update artifacts
- [`670b67d`](https://togithub.com/stakater/Reloader/commit/670b67d)
feat(chart): add vpa support

###
[`v1.0.69`](https://togithub.com/stakater/Reloader/releases/tag/v1.0.69)

[Compare
Source](https://togithub.com/stakater/Reloader/compare/v1.0.68...v1.0.69)

#### Changelog

- [`cca62bd`](https://togithub.com/stakater/Reloader/commit/cca62bd) Add
namespace field to avoid helm template failure
- [`0398d54`](https://togithub.com/stakater/Reloader/commit/0398d54)
Merge branch 'master' into issue/587
- [`981dda6`](https://togithub.com/stakater/Reloader/commit/981dda6)
Merge branch 'master' into issue/587
- [`48e2db4`](https://togithub.com/stakater/Reloader/commit/48e2db4)
Merge branch 'master' into issue/587
- [`9a465a4`](https://togithub.com/stakater/Reloader/commit/9a465a4)
Merge pull request
[#&#8203;605](https://togithub.com/stakater/Reloader/issues/605) from
yangtian9999/add_helm_chart_namespace
- [`b28b345`](https://togithub.com/stakater/Reloader/commit/b28b345)
Merge pull request
[#&#8203;612](https://togithub.com/stakater/Reloader/issues/612) from
fdberlking/issue/587
- [`5a25d8a`](https://togithub.com/stakater/Reloader/commit/5a25d8a)
Merge pull request
[#&#8203;617](https://togithub.com/stakater/Reloader/issues/617) from
stakater/renovate/github.com-argoproj-argo-rollouts-1.x
- [`0aa95c9`](https://togithub.com/stakater/Reloader/commit/0aa95c9)
\[skip-ci] Update artifacts
- [`82f01d5`](https://togithub.com/stakater/Reloader/commit/82f01d5)
fix(deps): update module github.com/argoproj/argo-rollouts to v1.6.6
- [`dbe44e1`](https://togithub.com/stakater/Reloader/commit/dbe44e1)
issue/587 - removed helm labels and annotations for Kustomize builds

###
[`v1.0.68`](https://togithub.com/stakater/Reloader/releases/tag/v1.0.68)

[Compare
Source](https://togithub.com/stakater/Reloader/compare/v1.0.67...v1.0.68)

#### Changelog

- [`2cfd29d`](https://togithub.com/stakater/Reloader/commit/2cfd29d)
Merge pull request
[#&#8203;616](https://togithub.com/stakater/Reloader/issues/616) from
stakater/renovate/stakater-vale-package-0.x
- [`3630836`](https://togithub.com/stakater/Reloader/commit/3630836)
\[skip-ci] Update artifacts
- [`f9bd452`](https://togithub.com/stakater/Reloader/commit/f9bd452)
chore(deps): update dependency stakater/vale-package to v0.0.8

</details>

<details>
<summary>traefik/traefik-helm-chart (traefik)</summary>

###
[`v26.1.0`](https://togithub.com/traefik/traefik-helm-chart/releases/tag/v26.1.0)

[Compare
Source](https://togithub.com/traefik/traefik-helm-chart/compare/v26.0.0...v26.1.0)

##### Important notice

:information_source: CRDs has been updated in this release. On Traefik
v2, there is no new or removed field, just description format update by
upstream library.

:warning: This Chart does not support Traefik v3 beta and rc versions.

##### Features

- update traefik docker tag to v2.11.0
([843d1d7](https://togithub.com/traefik/traefik-helm-chart/commit/843d1d75b856fc6b35e09b42278de3bdf8734c08))
- allow exposure of ports on internal service only
([d9f4731](https://togithub.com/traefik/traefik-helm-chart/commit/d9f4731fce7c8fdb134f417d977537e2ecad1a6e))
- create v1 Gateway and GatewayClass Version for Traefik v3
([85697f0](https://togithub.com/traefik/traefik-helm-chart/commit/85697f0cfbfae77539bfdb8ba8255e77735a762f))
- set runtimeClassName on pod spec
([c07d55c](https://togithub.com/traefik/traefik-helm-chart/commit/c07d55c277e69a341bfe48fcbf6059057a9820e7))

##### Bug Fixes

- 🐛 missing quote on experimental plugin args
([e7ce1b4](https://togithub.com/traefik/traefik-helm-chart/commit/e7ce1b410c858642069033305eb6362f26689f16))
- 🐛 set runtimeClassName at pod level
([3d76d3e](https://togithub.com/traefik/traefik-helm-chart/commit/3d76d3e8e3497f559216f73c91166f9b811f11e6))
- update traefik v3 serverstransporttcps CRD
([e404db9](https://togithub.com/traefik/traefik-helm-chart/commit/e404db9e271e939a33ba95bc59f12f8a54e87239))

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "before 4am on Monday" (UTC),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config help](https://togithub.com/renovatebot/renovate/discussions) if
that's undesired.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/hobroker/selfhosted).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4yNjkuMiIsInVwZGF0ZWRJblZlciI6IjM3LjI2OS4yIiwidGFyZ2V0QnJhbmNoIjoibWFzdGVyIn0=-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants