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.

Sign up for GitHub

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
Merged

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

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
19c6764
Add annotations to primary service and fix indentation in nginx deplo…
yellowplane13 Feb 16, 2024
78bec96
undo indentation
yellowplane13 Feb 21, 2024
46e63f8
add resources to nginx
yellowplane13 Feb 22, 2024
874f4bc
Merge branch 'master' into sr-add-annotations
yellowplane13 Mar 5, 2024
2d6cf09
Merge branch 'master' into sr-add-annotations
yellowplane13 Mar 15, 2024
6d4c791
update based on comment
yellowplane13 May 13, 2024
5767563
Merge branch 'sr-add-annotations' of github.com:yellowplane13/charts …
yellowplane13 May 13, 2024
bca1e93
Merge branch 'master' into sr-add-annotations
yellowplane13 May 13, 2024
89baba4
Merge branch 'master' into sr-add-annotations
yellowplane13 May 24, 2024
6d49116
Merge branch 'master' into sr-add-annotations
yellowplane13 Jul 8, 2024
ba6e469
Merge branch 'master' into sr-add-annotations
yellowplane13 Aug 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions stable/artifactory-ha/templates/artifactory-primary-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ metadata:
{{- with .Values.artifactory.primary.labels }}
{{ toYaml . | indent 4 }}
{{- end }}
{{- with .Values.artifactory.primary.annotations }}
annotations:
{{ toYaml . | indent 4 }}
{{- end }}
spec:
# Statically setting service type to ClusterIP since this is an internal only service
type: ClusterIP
Expand Down
2 changes: 2 additions & 0 deletions stable/artifactory-ha/templates/nginx-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 •
edited
Loading

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 •
edited
Loading

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.

containers:
- name: {{ .Values.nginx.name }}
image: {{ include "artifactory-ha.getImageInfoByValue" (list . "nginx") }}
Expand Down
1 change: 1 addition & 0 deletions stable/artifactory-ha/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1091,6 +1091,7 @@ artifactory:
# preStartCommand specific to the primary node, to be run after artifactory.preStartCommand
# preStartCommand:
labels: {}
annotations: {}
persistence:
## Set existingClaim to true or false
## If true, you must prepare a PVC with the name e.g `volume-myrelease-artifactory-ha-primary-0`
Expand Down
Loading