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

Relasing 4.0.21 chart with custom labels for rabbitmq and opa #597

Merged
merged 3 commits into from
Sep 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 charts/oes/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: oes
version: 4.0.20
version: 4.0.21
appVersion: 4.0.4.2
description: "ISD and Spinnaker with v1.30.1 with ISD custom Labels"
icon: https://raw.githubusercontent.com/OpsMx/enterprise-spinnaker/master/img/opsmx.png
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ spec:
{{- end }}
labels:
{{ toYaml .Values.autopilot.labels | indent 8 }}
{{ include "oes.standard-labels" . | indent 8 }}
spec:
volumes:
- name: autopilot-config-volume
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ metadata:
annotations:
app: oes
component: platform
{{ include "isd.standard-annotations" . | indent 4 }}
labels:
{{ toYaml .Values.platform.labels | indent 4 }}
{{ include "oes.standard-labels" . | indent 4 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ spec:
{{ toYaml .Values.rabbitmq.annotations | nindent 8 }}
{{- end }}
labels:
app: oes
component: rabbitmq
{{ toYaml .Values.rabbitmq.labels | indent 8 }}
{{ include "oes.standard-labels" . | indent 8 }}
spec:
containers:
Expand Down
2 changes: 1 addition & 1 deletion charts/oes/templates/deployments/opa-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
{{ toYaml .Values.opa.annotations | nindent 8 }}
{{- end }}
labels:
app: opa
{{ toYaml .Values.opa.labels | indent 8 }}
{{ include "oes.standard-labels" . | indent 8 }}
name: opa
spec:
Expand Down
6 changes: 5 additions & 1 deletion charts/oes/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,9 @@ rabbitmq:
image:
registry: quay.io/opsmxpublic/rabbitmq
repository: 3-management

labels: #If Required,Add Customer-specific labels as well
app: oes
component: rabbitmq
annotations:
moniker.spinnaker.io/application: isd

Expand Down Expand Up @@ -1291,6 +1293,8 @@ opa:
pullPolicy: IfNotPresent
annotations:
moniker.spinnaker.io/application: isd
labels: #If Required,Add Customer-specific labels as well
app: oes

####################################################
# AP installs a trial LDAP for POCs and testing purposes
Expand Down