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

Allow injection of Pod repository annotations #68

Merged
merged 6 commits into from
Oct 23, 2019

Conversation

ggimes
Copy link
Contributor

@ggimes ggimes commented Oct 19, 2019

  • Updated the deployment template
  • Updated Version
  • Generated a new Helm chart
  • Fixed the access rule file used for the demo mode for Oathkeeper version > 0.18

Related issue

Github issue: #278

Proposed changes

In order to be able to inject Pod resource annotation, I need to update the Deployment template. This is, in my case, needed in order to make the readiness/liveness probes work properly with istio enabled (istio.io/docs/ops/app-health-check/#use-annotations-on-pod).

Checklist

  • I have read the contributing guidelines
  • I have read the security policy
  • 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 green light (please contact [email protected]) from the maintainers to push the changes.
  • I have added tests that prove my fix is effective or that my feature works
  • I have added necessary documentation within the code base (if appropriate)

Further comments

I have generated a new version of Oathkeeper helm chart (helm package --app-version 0.0.29 --version 0.0.29 ./oathkeeper), moved the archive in docs/helm/charts and regenerated the index.yaml (helm repo index .). Please don't hesitate to let me know if I miss something or if not the way we do that (I have 10 days experience with Helm ;-))

Updated Version
Generated a new Helm chart
@CLAassistant
Copy link

CLAassistant commented Oct 19, 2019

CLA assistant check
Thank you for your submission, we really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 2 committers have signed the CLA.

✅ ggimes
❌ jmbarbieri
You have signed the CLA already but the status is still pending? Let us recheck it.

Copy link
Member

@aeneasr aeneasr left a comment

Choose a reason for hiding this comment

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

Please remove all docs/ changes as those will be generated by the CI

@@ -3,7 +3,7 @@ entries:
example-idp:
Copy link
Member

Choose a reason for hiding this comment

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

This file is autogenerated when we release a new version via git. Please revert this :)

helm/charts/oathkeeper/Chart.yaml Outdated Show resolved Hide resolved
helm/charts/oathkeeper/templates/deployment.yaml Outdated Show resolved Hide resolved
helm/charts/oathkeeper/values.yaml Outdated Show resolved Hide resolved
@ggimes ggimes force-pushed the deployment_annotations branch 2 times, most recently from 3dff61c to d3971ff Compare October 20, 2019 18:09
@ggimes ggimes force-pushed the deployment_annotations branch from d3971ff to f77a306 Compare October 20, 2019 18:12
@aeneasr
Copy link
Member

aeneasr commented Oct 23, 2019

Thank you!

@aeneasr aeneasr merged commit 732d6b4 into ory:master Oct 23, 2019
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