Skip to content

feat: separate nginx and django image tags #11054

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

Closed
corang wants to merge 3 commits into from
Closed

feat: separate nginx and django image tags #11054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a7ad86c
feat: separate nginx and django image tags
corang Oct 12, 2024
e026d42
Merge branch 'dev' into separate-tags
corang Oct 16, 2024
a9f4553
fix: update workflow to fit new values
corang Oct 16, 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
3 changes: 2 additions & 1 deletion .github/workflows/release-x-manual-helm-chart.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ jobs:
id: pin_image
run: |-
yq --version
yq -i '.tag="${{ github.event.inputs.release_number }}"' helm/defectdojo/values.yaml
yq -i '.django-tag="${{ github.event.inputs.release_number }}"' helm/defectdojo/values.yaml
yq -i '.nginx-tag="${{ github.event.inputs.release_number }}"' helm/defectdojo/values.yaml
echo "Current image tag:`yq -r '.tag' helm/defectdojo/values.yaml`"

- name: Package Helm chart
Expand Down
2 changes: 1 addition & 1 deletion helm/defectdojo/templates/celery-beat-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ spec:
- command:
- /entrypoint-celery-beat.sh
name: celery
image: "{{ template "celery.repository" . }}:{{ .Values.tag }}"
image: "{{ template "celery.repository" . }}:{{ .Values.django-tag }}"
imagePullPolicy: {{ .Values.imagePullPolicy }}
{{- if .Values.securityContext.enabled }}
securityContext:
Expand Down
2 changes: 1 addition & 1 deletion helm/defectdojo/templates/celery-worker-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ spec:
{{- end }}
{{- end }}
- name: celery
image: "{{ template "celery.repository" . }}:{{ .Values.tag }}"
image: "{{ template "celery.repository" . }}:{{ .Values.django-tag }}"
imagePullPolicy: {{ .Values.imagePullPolicy }}
{{- if .Values.securityContext.enabled }}
securityContext:
Expand Down
4 changes: 2 additions & 2 deletions helm/defectdojo/templates/django-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ spec:
timeoutSeconds: 5
{{- end }}
- name: uwsgi
image: '{{ template "django.uwsgi.repository" . }}:{{ .Values.tag }}'
image: '{{ template "django.uwsgi.repository" . }}:{{ .Values.django-tag }}'
imagePullPolicy: {{ .Values.imagePullPolicy }}
{{- if .Values.securityContext.enabled }}
securityContext:
Expand Down Expand Up @@ -222,7 +222,7 @@ spec:
resources:
{{- toYaml .Values.django.uwsgi.resources | nindent 10 }}
- name: nginx
image: '{{ template "django.nginx.repository" . }}:{{ .Values.tag }}'
image: '{{ template "django.nginx.repository" . }}:{{ .Values.nginx-tag }}'
imagePullPolicy: {{ .Values.imagePullPolicy }}
{{- if .Values.securityContext.enabled }}
securityContext:
Expand Down
3 changes: 2 additions & 1 deletion helm/defectdojo/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ repositoryPrefix: defectdojo
# When using a private registry, name of the secret that holds the registry secret (eg deploy token from gitlab-ci project)
# Create secrets as: kubectl create secret docker-registry defectdojoregistrykey --docker-username=registry_username --docker-password=registry_password --docker-server='https://index.docker.io/v1/'
# imagePullSecrets: defectdojoregistrykey
tag: latest
django-tag: latest
nginx-tag: latest

# Additional labels to add to the pods:
# podLabels:
Expand Down