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: disable monitoring.coreos.com/v1 api check #653

Merged
merged 6 commits into from
Nov 28, 2023

Conversation

fleblay
Copy link
Contributor

@fleblay fleblay commented Nov 27, 2023

Remove the .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" check done before enabling the service monitor
as this test will always fail

To avoid breaking changes, the default value for .Values.serviceMonitor.enabled is set to false.

Related Issue or Design Document

Checklist

  • [ x] I have read the contributing guidelines and signed the CLA.
  • [ x] I have referenced an issue containing the design document if my change introduces a new feature.
  • [ x] I have read the security policy.
  • [ x] I confirm that this pull request does not address a security vulnerability.
    If this pull request addresses a security vulnerability,
    I confirm that I got approval (please contact security@ory.sh) from the maintainers to push the changes.
  • [ x] I have added tests that prove my fix is effective or that my feature works.
  • [ x] I have added the necessary documentation within the code base (if appropriate).

Further comments

@CLAassistant
Copy link

CLAassistant commented Nov 27, 2023

CLA assistant check
All committers have signed the CLA.

@fleblay fleblay changed the title [SERVICE-MONITOR] Disable monitoring.coreos.com/v1 api check fix: disable monitoring.coreos.com/v1 api check Nov 27, 2023
Copy link
Collaborator

@Demonsthere Demonsthere left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please change the values in hacks/values so the CI will deploy the monitors :)

Copy link
Collaborator

@Demonsthere Demonsthere left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for adding the SM schema! :)

@@ -7,4 +7,4 @@ cd "$( dirname "${BASH_SOURCE[0]}" )/.."
schema_url="https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/"
k8s_version="1.27.2"

helm kubeconform "./helm/charts/${1}" --strict --schema-location "${schema_url}" -f "hacks/values/${1}.yaml" --kubernetes-version "${k8s_version}" --summary --verbose
helm kubeconform "./helm/charts/${1}" --strict --schema-location "${schema_url}" --schema-location ./hacks/servicemonitor_v1.json -f "hacks/values/${1}.yaml" --kubernetes-version "${k8s_version}" --summary --verbose
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this could be improved, but this is something to be done in a separate issue :)

@Demonsthere Demonsthere merged commit ac2b530 into ory:master Nov 28, 2023
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants