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

[artifactory-ha] Add Annotations to Primary Artifactory Service and Resources to Nginx Deployment #1862

Merged
merged 11 commits into from
Oct 30, 2024

Conversation

yellowplane13
Copy link
Contributor

@yellowplane13 yellowplane13 commented Feb 16, 2024

Add Annotations to primary artifactory service
Add resources to setup container in the nginx deployment yaml

PR Checklist

  • Title of the PR starts with chart name (e.g. [artifactory])

What this PR does / why we need it:
Add Annotations to Primary Artifactory Service: This change adds annotations to the primary Artifactory service.

Add resources block to setup container in nginx deployment yaml: This change gives the ability to change limits and requests for the setup init container within the nginx deployment.

Copy link

github-actions bot commented Feb 16, 2024

CLA Assistant Lite bot All contributors have signed the CLA ✍️ ✅

@yellowplane13
Copy link
Contributor Author

I have read the CLA Document and I hereby sign the CLA

@yellowplane13 yellowplane13 changed the title [artifactory-primary-service][nginx-deployment]:Add Annotations to Primary Artifactory Service and Fix Indentation in Nginx Deployment [artifactory-ha]:Add Annotations to Primary Artifactory Service and Fix Indentation in Nginx Deployment Feb 16, 2024
@yellowplane13 yellowplane13 changed the title [artifactory-ha]:Add Annotations to Primary Artifactory Service and Fix Indentation in Nginx Deployment [artifactory-ha] Add Annotations to Primary Artifactory Service and Fix Indentation in Nginx Deployment Feb 16, 2024
@oumkale oumkale requested review from oumkale and chukka February 20, 2024 08:08
@yellowplane13 yellowplane13 changed the title [artifactory-ha] Add Annotations to Primary Artifactory Service and Fix Indentation in Nginx Deployment [artifactory-ha] Add Annotations to Primary Artifactory Service and add Resources to Nginx Deployment Feb 22, 2024
@yellowplane13 yellowplane13 changed the title [artifactory-ha] Add Annotations to Primary Artifactory Service and add Resources to Nginx Deployment [artifactory-ha] Add Annotations to Primary Artifactory Service and Resources to Nginx Deployment Feb 22, 2024
@@ -79,6 +79,8 @@ spec:
volumeMounts:
- mountPath: {{ .Values.nginx.persistence.mountPath | quote }}
name: nginx-volume
resources:
{{ toYaml .Values.nginx.resources | indent 10 }}
Copy link

Choose a reason for hiding this comment

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

maybe "{{ toYaml .Values.initContainers.resources | indent 10 }}" better? this is init container

Copy link
Contributor Author

@yellowplane13 yellowplane13 May 13, 2024

Choose a reason for hiding this comment

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

Yes, you're right. Just updated it, thanks for pointing it out

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hi @se-kai , could you please review the PR again?
Tagging @oumkale and @chukka as well. As soon as this is merged into a release, we can use this as our upstream chart instead of downloading the entire thing into our repo. Thank you 🙏

Copy link

Choose a reason for hiding this comment

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

this is already fixed and avialble in current main branch
https://github.com/jfrog/charts/blob/master/stable/artifactory-ha/templates/nginx-deployment.yaml#L79
I used it already and it works fine for me.

Copy link
Contributor Author

@yellowplane13 yellowplane13 Aug 14, 2024

Choose a reason for hiding this comment

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

Hi @se-kai , thank you for the update. Appreciate having resources block added to nginx-deployment.

We also need annotations added to artifactory-primary-service.yaml's metadata. It is not originally added and we can't use this chart as an upstream until that's added unfortunately. Can that be taken into account for the next release? Link for reference : https://github.com/jfrog/charts/blob/master/stable/artifactory-ha/templates/artifactory-primary-service.yaml#L6
I can rebase and update this PR with just the artifactory-primary-service.yaml changes required if you need.

@yellowplane13 yellowplane13 requested a review from se-kai May 13, 2024 19:05
@amithins amithins changed the base branch from master to jp-10.20.0 October 30, 2024 08:09
@amithins amithins merged commit f43e0fe into jfrog:jp-10.20.0 Oct 30, 2024
1 check passed
amithins pushed a commit that referenced this pull request Oct 30, 2024
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.

3 participants