feat(argo-cd): make ServiceMonitor deployment conditional on CRD existence #2154

alex-souslik-hs · 2023-07-08T15:37:14Z

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).

Signed-off-by: alex-souslik-hs <[email protected]>

yu-croco · 2023-07-09T03:59:06Z

Hi @alex-souslik-hs , thank you for your PR.
Can you please separate this PR into resources(e.g. argo-cd, argo-workflows)?
We make PR by each resource, instead of bundling them.
Ref: https://github.com/argoproj/argo-helm/pulls?q=is%3Apr+is%3Amereged

Also can you please give us the explanation of motivation for this change?
I am not familiar with it but does monitoring.coreos.com/v1 have compatibility to specific k8s version (I didn't get info for this, so I want the detail) ?

alex-souslik-hs · 2023-07-09T07:03:45Z

Hi @alex-souslik-hs , thank you for your PR. Can you please separate this PR into resources(e.g. argo-cd, argo-workflows)? We make PR by each resource, instead of bundling them. Ref: https://github.com/argoproj/argo-helm/pulls?q=is%3Apr+is%3Amereged

@yu-croco Off course I can but if you can make an exception for this particular case that'd be great. If not I'll work on splitting.

Also can you please give us the explanation of motivation for this change? I am not familiar with it but does monitoring.coreos.com/v1 have compatibility to specific k8s version (I didn't get info for this, so I want the detail) ?

monitoring.coreos.com/v1 is not a part of the k8s API but comes from the Prometheus Operator. So for example if I deploy a new cluster and I want to install ArgoCD first and Prometheus after I need two value files for ArgoCD.

yu-croco · 2023-07-10T08:15:03Z

@alex-souslik-hs

@yu-croco Off course I can but if you can make an exception for this particular case that'd be great. If not I'll work on splitting.

Please separate PR.

monitoring.coreos.com/v1 is not a part of the k8s API but comes from the Prometheus Operator. So for example if I deploy a new cluster and I want to install ArgoCD first and Prometheus after I need two value files for ArgoCD.

Thank you for explaining!

Signed-off-by: alex-souslik-hs <[email protected]>

Signed-off-by: Alex Souslik <[email protected]>

alex-souslik-hs · 2023-07-15T08:24:15Z

@yu-croco cleaned up PR to be ArgoCD only, this is the one that was important to me anyway.

Signed-off-by: Alex Souslik <[email protected]>

mkilchhofer

Almost LGTM

charts/argo-cd/Chart.yaml

Co-authored-by: Marco Kilchhofer <[email protected]> Signed-off-by: Alex Souslik <[email protected]>

Signed-off-by: Alex Souslik <[email protected]>

alex-souslik-hs · 2023-07-17T12:02:11Z

@mkilchhofer done.

Signed-off-by: Alex Souslik <[email protected]>

yu-croco

LGTM

pdrastil

LGTM

batazor · 2023-07-19T08:35:02Z

@alex-souslik-hs Will this work correctly in case prometheus-operator is installed via argocd?

Now I am installing in this sequence prometheus-operator-crd -> argocd -> prometheus-operator

Won't we have cases that argocd will be installed without installing monitoring components?

mkilchhofer · 2023-07-19T16:00:03Z

@batazor
If the CRDs are installed via Argo CD, the first helm install of Argo CD doesn't install the ServiceMonitors.

As soon as there is a helm upgrade after Argo CD reconciled the CRDs, it should install the ServiceMonitors.

Add workaround for breaking change in argoproj/argo-helm#2154: > make ServiceMonitor deployment conditional on CRD existence `helm template` does not detect cluster capabilities. Why is this change useful? I am not sure. IMHO, as a user, when I set `serviceMonitor.enabled=true` in my helm value, it is very clear that I probably want to install ServiceMonitor. As a GitOps engine that uses desired state model, it should just attempt to do it. The helm chart seems to care about some cluster's current state too much.

alex-souslik-hs · 2023-08-08T19:09:54Z

@alex-souslik-hs Will this work correctly in case prometheus-operator is installed via argocd?

Now I am installing in this sequence prometheus-operator-crd -> argocd -> prometheus-operator

Won't we have cases that argocd will be installed without installing monitoring components?

@batazor
If you pre-install the CRDs you'll have the same behavior as before, the idea is to allow you to install ArgoCD first and deploy everything else with it without modifying its values.

@yuha0
It's important to note the optional dependency redis-ha chart works the same way, so it's possible you already had this behavior on some of your ServiceMonitors.

* feat(argocd-apps): add permitOnlyProjectScopedClusters flag (argoproj#2149) Signed-off-by: Fabián Sellés Rosa <[email protected]> * feat(argo-cd): Allow configuring Dex's init image resources separately (argoproj#2161) Allow configuring Dex's init image resources separately Signed-off-by: Angelo Ross <[email protected]> * chore(deps): bump helm/kind-action from 1.7.0 to 1.8.0 (argoproj#2163) Bumps [helm/kind-action](https://github.com/helm/kind-action) from 1.7.0 to 1.8.0. - [Release notes](https://github.com/helm/kind-action/releases) - [Commits](helm/kind-action@fa81e57...dda0770) --- updated-dependencies: - dependency-name: helm/kind-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump actions/labeler from 4.2.0 to 4.3.0 (argoproj#2164) Bumps [actions/labeler](https://github.com/actions/labeler) from 4.2.0 to 4.3.0. - [Release notes](https://github.com/actions/labeler/releases) - [Commits](actions/labeler@0967ca8...ac9175f) --- updated-dependencies: - dependency-name: actions/labeler dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Aikawa <[email protected]> * chore(deps): bump actions/setup-python from 4.6.1 to 4.7.0 (argoproj#2165) Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4.6.1 to 4.7.0. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](actions/setup-python@bd6b4b6...61a6322) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Aikawa <[email protected]> * fix(argo-cd): Ensure `app.kubernetes.io/version` label is valid (argoproj#2148) Signed-off-by: Mathieu Parent <[email protected]> * feat(argo-cd): allow configurable hpa metrics (argoproj#2166) * allow configurable HPA metrics Signed-off-by: Zach Swanson <[email protected]> * update docs Signed-off-by: Zach Swanson <[email protected]> * Update chart version and changelog Signed-off-by: Zach Swanson <[email protected]> Signed-off-by: Zach Swanson <[email protected]> * Fix values/readme reference to repo server Signed-off-by: Zach Swanson <[email protected]> --------- Signed-off-by: Zach Swanson <[email protected]> Signed-off-by: Zach Swanson <[email protected]> Signed-off-by: Zach Swanson <[email protected]> * feat(argo-cd): make ServiceMonitor deployment conditional on CRD existence (argoproj#2154) * made ServiceMonitor deployment conditional on CRD existence Signed-off-by: alex-souslik-hs <[email protected]> * remove non ArgoCD changes Signed-off-by: alex-souslik-hs <[email protected]> * add newline Signed-off-by: Alex Souslik <[email protected]> * Change chage description Signed-off-by: Alex Souslik <[email protected]> * Update charts/argo-cd/Chart.yaml Co-authored-by: Marco Kilchhofer <[email protected]> Signed-off-by: Alex Souslik <[email protected]> --------- Signed-off-by: alex-souslik-hs <[email protected]> Signed-off-by: Alex Souslik <[email protected]> Co-authored-by: Marco Kilchhofer <[email protected]> * feat(argo-cd): Upgrade argocd to v2.7.8 (argoproj#2173) Signed-off-by: smcavallo <[email protected]> * feat(argo-rollouts): Upgrade Argo Rollouts to v1.5.1 (argoproj#2174) * chore(argo-workflows): Upgrade to 3.4.9 (argoproj#2175) chore(argo-workflow): Upgrade to 3.4.9 - [ ] update CRD changes Signed-off-by: jmeridth <[email protected]> * feat(argocd-apps): syncOptions for applications (argoproj#2176) Signed-off-by: Mathieu Parent <[email protected]> Co-authored-by: Aikawa <[email protected]> * fix(argocd-apps): fix indent of syncOptions (argoproj#2181) * chore(github): use table for Emeritus (argoproj#2182) - to matches how `argoproj` lists Alumni (https://github.com/argoproj/argoproj/blob/6011d3e17300d4b642a1ab5bdb3551c5f6da9021/MAINTAINERS.md?plain=1#L11) - though it has more details including role and affiliation. could do that here too, but I don't know what all those are, so left those columns out - fortunately everyone's name was listed on their profile, so just copy+paste those! - confirmed that all links work Signed-off-by: Anton Gilgur <[email protected]> * fix(argo-rollouts): Use annotation cont metrics (argoproj#2184) * fix(argo-rollouts): Use annotation cont metrics Signed-off-by: Artur Mudrykh <[email protected]> * fix(argo-rollouts): add changes and bump version Signed-off-by: Artur Mudrykh <[email protected]> * fix chart.yaml Signed-off-by: Artur Mudrykh <[email protected]> --------- Signed-off-by: Artur Mudrykh <[email protected]> Co-authored-by: Artur Mudrykh <[email protected]> * chore(argo-cd): Upgrade Argo CD to v2.7.9 (argoproj#2186) feat(argo-cd): Upgrade argocd to v2.7.9 Signed-off-by: Venkata Mutyala <[email protected]> * feat(argo-workflows): allow setting executor args (argoproj#2177) * feat(argo-cd): add labels to notifications secret (argoproj#2191) (argoproj#2192) Signed-off-by: carlos gonzález <[email protected]> * chore(argo-cd): Upgrade Argo CD to v2.7.10 (argoproj#2197) Signed-off-by: yu-croco <[email protected]> * fix(argo-rollouts): fix helm lint error when extraObjects is defined (argoproj#2196) fix(extra-manifests): fix helm lint error when extraObjecrts is defined Signed-off-by: Grégory SANCHEZ <[email protected]> Co-authored-by: Jason Meridth <[email protected]> * fix(argo-cd): Template configuration keys as a string instead of map (argoproj#2205) * fix(argo-rollouts): Add required ingress permission (argoproj#2207) * chore(argo-cd): Upgrade Argo CD to v2.7.11 (argoproj#2210) Signed-off-by: yu-croco <[email protected]> * feat(github): add Helm OCI support (argoproj#2209) Signed-off-by: Engin Diri <[email protected]> * feat(argo-cd): Upgrade Argo CD to 2.8.0 (argoproj#2170) Signed-off-by: Petr Drastil <[email protected]> Co-authored-by: Aikawa <[email protected]> * fix(argo-rollouts): add CI for enabling extra objects for argo-rollouts (argoproj#2198) * fix(argo-rollouts): add CI for enabling extra objects for argo-rollouts Add CI for extra objects Signed-off-by: jmeridth <[email protected]> * fix: rename extra objects ci file to have -values suffix Signed-off-by: jmeridth <[email protected]> --------- Signed-off-by: jmeridth <[email protected]> Co-authored-by: Aikawa <[email protected]> * fix(argo-cd): Fix global log level configuration (argoproj#2213) fix(argo-cd) - Fix global log level configuration Signed-off-by: Petr Drastil <[email protected]> * chore(argo-cd): Change applicationSet replicaCount to replicas (argoproj#2214) Signed-off-by: Petr Drastil <[email protected]> * fix(argo-cd): add missing permissions to run actions (argoproj#2212) Signed-off-by: Mickaël Canévet <[email protected]> * fix(argo-workflows): Server only needs `get` Secrets (argoproj#2211) - as of argoproj/argo-workflows@aa366db, the Server no longer needs `list` or `watch` and only uses `get` - this was released as part of [v3.4.0](https://github.com/argoproj/argo-workflows/blob/master/CHANGELOG.md#v340-rc1-2022-08-09), and the current version of the chart uses v3.4.9 (per `Chart.yaml#appVersion`) - `update` is not needed either for SSO secret - manifests RBAC: https://github.com/argoproj/argo-workflows/blob/a68ea0feabc87c09d5e13d12e6f0d1a61adc5b16/manifests/cluster-install/argo-server-rbac/argo-server-clusterole.yaml#L18 - SSO source code only uses [`create`](https://github.com/argoproj/argo-workflows/blob/20d0923611f1df6b7147c3547aeeff6b6bfecf18/server/auth/sso/sso.go#L140) and [`get`](https://github.com/argoproj/argo-workflows/blob/20d0923611f1df6b7147c3547aeeff6b6bfecf18/server/auth/sso/sso.go#L151) - (also some `get`s above that for [`clientID`](https://github.com/argoproj/argo-workflows/blob/20d0923611f1df6b7147c3547aeeff6b6bfecf18/server/auth/sso/sso.go#L127) and [`clientSecret`](https://github.com/argoproj/argo-workflows/blob/20d0923611f1df6b7147c3547aeeff6b6bfecf18/server/auth/sso/sso.go#L106) as well) Signed-off-by: Anton Gilgur <[email protected]> Co-authored-by: Aikawa <[email protected]> Co-authored-by: Jason Meridth <[email protected]> * docs(argo-cd): Rename comment of repositoryCredentials to credentialTemplates (argoproj#2219) Rename comment of repositoryCredentials to credentialTemplates Signed-off-by: Ali Reza <[email protected]> * feat(argo-rollouts): update servicemonitor.yaml to allow for namespace to be set (argoproj#2222) * Update servicemonitor.yaml to allow for namespace to be set Signed-off-by: Nick Kampe <[email protected]> * Update README.md Signed-off-by: Nick Kampe <[email protected]> * Update values.yaml Signed-off-by: Nick Kampe <[email protected]> * Update Chart.yaml Signed-off-by: Nick Kampe <[email protected]> * Update Chart.yaml Signed-off-by: Nick Kampe <[email protected]> * Alphabetized namespace addition in README Signed-off-by: Nick Kampe <[email protected]> --------- Signed-off-by: Nick Kampe <[email protected]> * chore(argo-workflows): Upgrade to Argo Workflows v3.4.10 (argoproj#2220) * feat(argo-workflows): add imagePullSecret for workflow sa (argoproj#2226) Signed-off-by: Fuochi <[email protected]> * chore(argo-workflows): update comment for azure artifact repository blobNameFormat (argoproj#2229) * chore(argo-cd): Upgrade Argo CD to v2.8.1 (argoproj#2230) Signed-off-by: yu-croco <[email protected]> * chore(argo-cd): Upgrade Argo CD to v2.8.2 (argoproj#2231) Signed-off-by: yu-croco <[email protected]> * fix(argo-cd): Fix applicationSet HA examples in README.md (argoproj#2232) Signed-off-by: Joonas Venäläinen <[email protected]> * chore(deps): bump actions/checkout from 3.5.3 to 3.6.0 (argoproj#2234) Bumps [actions/checkout](https://github.com/actions/checkout) from 3.5.3 to 3.6.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@c85c95e...f43a0e5) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(argo-cd): Upgrade redis-exporter to 1.53.0 (argoproj#2236) Signed-off-by: Petr Drastil <[email protected]> Co-authored-by: Aikawa <[email protected]> * chore(argo-cd): Remove support for legacy cert-manager APIs (argoproj#2238) * chore(argo-cd): Remove support for legacy cert-manager APIs Signed-off-by: Petr Drastil <[email protected]> * Bump minor version Signed-off-by: Petr Drastil <[email protected]> --------- Signed-off-by: Petr Drastil <[email protected]> * chore(argo-cd): Remove support for autoscaling/v1 (argoproj#2237) Signed-off-by: Petr Drastil <[email protected]> * chore(argo-events): Upgrade argo-events to 1.8.1 (argoproj#2247) https://github.com/argoproj/argo-events/releases/tag/v1.8.1 Signed-off-by: jmeridth <[email protected]> * fix(argo-cd): Update values.yaml - update custom css styles side bar example (argoproj#2245) * Update values.yaml - update custom css styles side barexample .nav-bar is no longer the css class name Signed-off-by: JesseBot <[email protected]> * Update Chart.yaml - update patch version for values.yaml comment update Signed-off-by: JesseBot <[email protected]> * Update Chart.yaml - update change log Signed-off-by: JesseBot <[email protected]> --------- Signed-off-by: JesseBot <[email protected]> * chore(argo-rollouts): Upgrade Argo Rollouts to v1.6.0 (argoproj#2252) * chore(argo-rollouts): Upgrade Argo Rollouts to v1.6.0 Signed-off-by: Gustav Kofoed Clausen <[email protected]> * chore(argo-rollouts): Update CRDs to matching version Signed-off-by: Gustav Kofoed Clausen <[email protected]> --------- Signed-off-by: Gustav Kofoed Clausen <[email protected]> Co-authored-by: Gustav Kofoed Clausen <[email protected]> * fix(argo-cd): Make the PathType configurable when using single ingress resource in AWS (argoproj#2251) * Make the PathType configurable when using single ingress resource in AWS Signed-off-by: Tamas <[email protected]> * update chart version and doc Signed-off-by: Tamas <[email protected]> * Fix reference to value in range Signed-off-by: Tamas <[email protected]> --------- Signed-off-by: Tamas <[email protected]> Co-authored-by: Tamas <[email protected]> * chore(argo-cd): Upgrade Argo CD to v2.8.3 (argoproj#2254) Signed-off-by: Alexej Disterhoft <[email protected]> * chore(argo-workflows): Upgrade Argo Workflows to v3.4.11 (argoproj#2255) * fix(argo-cd): Restart Repo Server and Application Controller as following the change of Argo CD CM (argoproj#2235) * fix(argo-cd): Restart Repo Server and Application Controller as following the change of Argo CD CM Signed-off-by: yu-croco <[email protected]> * fix(argo-cd): Aligne condition to argocd-cm Signed-off-by: yu-croco <[email protected]> --------- Signed-off-by: yu-croco <[email protected]> * docs(argo-cd): Document scheduling parameters for redis-ha (argoproj#2253) Signed-off-by: Petr Drastil <[email protected]> * feat(argo-cd): adds toggle for helm-working-dir (argoproj#2249) - Adds a toggle to be able to turn off the helm-working-dir for the repo server deployment. Using a shared helm repo storage directory can cause issues when multiple helm commands are being run in parallel. The repo server also has the ability to rebuild the repos and do updates in the normal flow for checking the status of an application so it won't cause issues if it's disabled. Signed-off-by: Andrew Hamilton <[email protected]> * chore(deps): bump actions/checkout from 3.6.0 to 4.0.0 (argoproj#2258) Bumps [actions/checkout](https://github.com/actions/checkout) from 3.6.0 to 4.0.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@f43a0e5...3df4ab1) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump actions/upload-artifact from 3.1.2 to 3.1.3 (argoproj#2259) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3.1.2 to 3.1.3. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](actions/upload-artifact@0b7f8ab...a8a3f3a) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Aikawa <[email protected]> * docs(argo-workflows): add an HA section (argoproj#2183) * feat(argo-workflows): add a sample HA config - a `values-ha.yaml` as an example for how one would set-up HA according to the Argo Workflows docs Signed-off-by: Anton Gilgur <[email protected]> * docs(argo-workflows): add an HA section - plus add a test for HA, which the docs link to as an example - link back to [upstream docs](https://argoproj.github.io/argo-workflows/high-availability/) as well - follow the same basic structure as the [Argo CD chart for HA](https://github.com/argoproj/argo-helm/blob/3e35b0c7f7d758d553b17f369cc5940484ef5d89/charts/argo-cd/README.md?plain=1#L17) - as asked in review Signed-off-by: Anton Gilgur <[email protected]> --------- Signed-off-by: Anton Gilgur <[email protected]> Signed-off-by: Anton Gilgur <[email protected]> Co-authored-by: Aikawa <[email protected]> * fix(argo-cd): Migrate leftover of applicationSet.replicaCount to applicationSet.replicas (argoproj#2261) Signed-off-by: yu-croco <[email protected]> * docs(argo-cd): improve changelog (argoproj#2262) * clarify 5.19.0 changes * revise wording Signed-off-by: Josh Soref <[email protected]> --------- Signed-off-by: Fabián Sellés Rosa <[email protected]> Signed-off-by: Angelo Ross <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Mathieu Parent <[email protected]> Signed-off-by: Zach Swanson <[email protected]> Signed-off-by: Zach Swanson <[email protected]> Signed-off-by: Zach Swanson <[email protected]> Signed-off-by: alex-souslik-hs <[email protected]> Signed-off-by: Alex Souslik <[email protected]> Signed-off-by: smcavallo <[email protected]> Signed-off-by: jmeridth <[email protected]> Signed-off-by: Anton Gilgur <[email protected]> Signed-off-by: Artur Mudrykh <[email protected]> Signed-off-by: Venkata Mutyala <[email protected]> Signed-off-by: carlos gonzález <[email protected]> Signed-off-by: yu-croco <[email protected]> Signed-off-by: Grégory SANCHEZ <[email protected]> Signed-off-by: Engin Diri <[email protected]> Signed-off-by: Petr Drastil <[email protected]> Signed-off-by: Mickaël Canévet <[email protected]> Signed-off-by: Ali Reza <[email protected]> Signed-off-by: Nick Kampe <[email protected]> Signed-off-by: Fuochi <[email protected]> Signed-off-by: Joonas Venäläinen <[email protected]> Signed-off-by: JesseBot <[email protected]> Signed-off-by: Gustav Kofoed Clausen <[email protected]> Signed-off-by: Tamas <[email protected]> Signed-off-by: Alexej Disterhoft <[email protected]> Signed-off-by: Andrew Hamilton <[email protected]> Signed-off-by: Anton Gilgur <[email protected]> Signed-off-by: Josh Soref <[email protected]> Co-authored-by: Fabián Sellés Rosa <[email protected]> Co-authored-by: Angelo Ross <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Aikawa <[email protected]> Co-authored-by: Mathieu Parent <[email protected]> Co-authored-by: Zach Swanson <[email protected]> Co-authored-by: Alex Souslik <[email protected]> Co-authored-by: Marco Kilchhofer <[email protected]> Co-authored-by: smcavallo <[email protected]> Co-authored-by: Takuma Kume <[email protected]> Co-authored-by: Jason Meridth <[email protected]> Co-authored-by: Anton Gilgur <[email protected]> Co-authored-by: Artur <[email protected]> Co-authored-by: Artur Mudrykh <[email protected]> Co-authored-by: Venkata Mutyala <[email protected]> Co-authored-by: Andy Cobaugh <[email protected]> Co-authored-by: carlos gonzález <[email protected]> Co-authored-by: Grégory SANCHEZ <[email protected]> Co-authored-by: Petr Drastil <[email protected]> Co-authored-by: Engin Diri <[email protected]> Co-authored-by: Mickaël Canévet <[email protected]> Co-authored-by: Ali Reza <[email protected]> Co-authored-by: Nick Kampe <[email protected]> Co-authored-by: Fuochi <[email protected]> Co-authored-by: Jeongwon Song <[email protected]> Co-authored-by: Joonas Venäläinen <[email protected]> Co-authored-by: JesseBot <[email protected]> Co-authored-by: Gustav Kofoed Clausen <[email protected]> Co-authored-by: Gustav Kofoed Clausen <[email protected]> Co-authored-by: Tamas Szasz <[email protected]> Co-authored-by: Tamas <[email protected]> Co-authored-by: Alexej Disterhoft <[email protected]> Co-authored-by: Andrew Hamilton <[email protected]> Co-authored-by: Josh Soref <[email protected]>

FalconerTC · 2023-09-20T12:28:38Z

I believe this change has caused my ArgoCD service monitors to disappear. I manage ArgoCD with ArgoCD and after this upgrade I am no loner seeing any ArgoCD Service Monitors (I am however seeing ServiceMonitor for argo rollouts, but I see that's because this capabilities check isn't set there). Is there something in particular I should do to mock Capabilities.APIVersions.Has "monitoring.coreos.com/v1 when managing argocd with argocd?

edit: Looks like this is actually an issue with HelmChartInflationGenerator in kustomize (kubernetes-sigs/kustomize#3458)

mkilchhofer · 2023-09-22T18:43:30Z

Yup some tools like Kustomize and Helmfile do not pass the available APIversions to helm. In your mentioned issue above, there is also a comment which explains how to pass APIversions:

Example:

namespace: foo

helmCharts:
- name: bar
  releaseName: bar

  #...
  apiVersions:
    - monitoring.coreos.com/v1
  #...

made ServiceMonitor deployment conditional on CRD existence

714682f

Signed-off-by: alex-souslik-hs <[email protected]>

alex-souslik-hs requested review from jmeridth, pdrastil, tico24, mbevc1, mkilchhofer, yu-croco and vladlosev as code owners July 8, 2023 15:37

github-actions bot added argo-workflows argo-events argo-cd argo-rollouts argocd-image-updater size/M labels Jul 8, 2023

alex-souslik-hs changed the title ~~feat(all): made ServiceMonitor deployment conditional on CRD existence~~ feat(deps): made ServiceMonitor deployment conditional on CRD existence Jul 8, 2023

github-actions bot added size/L size/M argocd-apps and removed size/M argo-events argo-rollouts argocd-image-updater argo-workflows argocd-apps size/L labels Jul 15, 2023

alex-souslik-hs changed the title ~~feat(deps): made ServiceMonitor deployment conditional on CRD existence~~ feat(argo-cd): made ServiceMonitor deployment conditional on CRD existence Jul 15, 2023

remove non ArgoCD changes

fbaf254

Signed-off-by: alex-souslik-hs <[email protected]>

github-actions bot removed the size/M label Jul 15, 2023

add newline

753b4d8

Signed-off-by: Alex Souslik <[email protected]>

alex-souslik-hs changed the title ~~feat(argo-cd): made ServiceMonitor deployment conditional on CRD existence~~ feat(argo-cd): make ServiceMonitor deployment conditional on CRD existence Jul 15, 2023

Change chage description

b51b4d2

Signed-off-by: Alex Souslik <[email protected]>

mkilchhofer requested changes Jul 17, 2023

View reviewed changes

charts/argo-cd/Chart.yaml Outdated Show resolved Hide resolved

alex-souslik-hs and others added 2 commits July 17, 2023 15:00

Update charts/argo-cd/Chart.yaml

0914fd4

Co-authored-by: Marco Kilchhofer <[email protected]> Signed-off-by: Alex Souslik <[email protected]>

Merge branch 'main' into main

a198c99

Signed-off-by: Alex Souslik <[email protected]>

Merge branch 'main' into main

3bab909

Signed-off-by: Alex Souslik <[email protected]>

alex-souslik-hs requested a review from mkilchhofer July 17, 2023 13:03

yu-croco approved these changes Jul 17, 2023

View reviewed changes

pdrastil approved these changes Jul 17, 2023

View reviewed changes

mkilchhofer approved these changes Jul 18, 2023

View reviewed changes

mkilchhofer merged commit c2f813e into argoproj:main Jul 18, 2023
8 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(argo-cd): make ServiceMonitor deployment conditional on CRD existence #2154

feat(argo-cd): make ServiceMonitor deployment conditional on CRD existence #2154

alex-souslik-hs commented Jul 8, 2023 •

edited by mbevc1

Loading

yu-croco commented Jul 9, 2023 •

edited

Loading

alex-souslik-hs commented Jul 9, 2023 •

edited

Loading

yu-croco commented Jul 10, 2023

alex-souslik-hs commented Jul 15, 2023

mkilchhofer left a comment

alex-souslik-hs commented Jul 17, 2023

yu-croco left a comment

pdrastil left a comment

batazor commented Jul 19, 2023

mkilchhofer commented Jul 19, 2023

alex-souslik-hs commented Aug 8, 2023

FalconerTC commented Sep 20, 2023 •

edited

Loading

mkilchhofer commented Sep 22, 2023 •

edited

Loading

feat(argo-cd): make ServiceMonitor deployment conditional on CRD existence #2154

feat(argo-cd): make ServiceMonitor deployment conditional on CRD existence #2154

Conversation

alex-souslik-hs commented Jul 8, 2023 • edited by mbevc1 Loading

yu-croco commented Jul 9, 2023 • edited Loading

alex-souslik-hs commented Jul 9, 2023 • edited Loading

yu-croco commented Jul 10, 2023

alex-souslik-hs commented Jul 15, 2023

mkilchhofer left a comment

Choose a reason for hiding this comment

alex-souslik-hs commented Jul 17, 2023

yu-croco left a comment

Choose a reason for hiding this comment

pdrastil left a comment

Choose a reason for hiding this comment

batazor commented Jul 19, 2023

mkilchhofer commented Jul 19, 2023

alex-souslik-hs commented Aug 8, 2023

FalconerTC commented Sep 20, 2023 • edited Loading

mkilchhofer commented Sep 22, 2023 • edited Loading

alex-souslik-hs commented Jul 8, 2023 •

edited by mbevc1

Loading

yu-croco commented Jul 9, 2023 •

edited

Loading

alex-souslik-hs commented Jul 9, 2023 •

edited

Loading

FalconerTC commented Sep 20, 2023 •

edited

Loading

mkilchhofer commented Sep 22, 2023 •

edited

Loading