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

Fixed mirrord-operator deployment template #154

Merged
merged 2 commits into from
Jan 15, 2025
Merged

Fixed mirrord-operator deployment template #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f83a2f6
Moved vars above license ifs
Razz4780 Jan 15, 2025
511db09
Chart version bump
Razz4780 Jan 15, 2025
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
2 changes: 1 addition & 1 deletion mirrord-operator/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 1.16.3
version: 1.16.4

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
8 changes: 4 additions & 4 deletions mirrord-operator/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,6 @@ spec:
- name: OPERATOR_TLS_KEY_PATH
value: /tls/tls.key
{{- end }}
{{- if or .Values.license.file.data .Values.license.pemRef }}
- name: OPERATOR_LICENSE_PATH
value: /license/license.pem
{{- else if .Values.license.key }}
{{- if .Values.agent.tls }}
- name: OPERATOR_AGENT_CONNECTION_TLS
value: "true"
Expand All @@ -104,6 +100,10 @@ spec:
{{- end }}
- name: OPERATOR_COPY_TARGET_USE_AGENT_IMAGE
value: {{ .Values.operator.copyTarget.useAgentImage | ternary "true" "false" | quote }}
{{- if or .Values.license.file.data .Values.license.pemRef }}
- name: OPERATOR_LICENSE_PATH
value: /license/license.pem
{{- else if .Values.license.key }}
envFrom:
- secretRef:
name: {{ .Values.license.file.secret }}
Expand Down
Loading