Skip to content

Commit

Permalink
Fix json handling for tl500 docs configmap and label selectors in dep…
Browse files Browse the repository at this point in the history
…loyment (#143)

* Fix json handling for tl500 docs configmap

* Add fix for json handling, update the devfile var name, updated deployment
  • Loading branch information
jfilipcz authored Aug 5, 2022
1 parent 5bdc572 commit edc6658
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ metadata:
name: {{ .Values.docs.config.configMapName }}
namespace: {{ $.Values.docs.namespace }}
data:
all.json: {{ $.Values.docs.config.configFileContent }}
all.json: {{ $.Values.docs.config.configFileContent | toPrettyJson }}
{{- end }}
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
{{- if .Values.docs }}
---
apiVersion: apps.openshift.io/v1
apiVersion: apps/v1
kind: Deployment
metadata:
name: "{{ .Values.docs.name }}"
namespace: "{{ .Values.docs.namespace }}"
labels:
app: "{{ .Values.docs.name }}"
spec:
replicas: 1
selector:
matchLabels:
app: "{{ .Values.docs.name }}"
template:
metadata:
labels:
app: "{{ .Values.docs.name }}"
spec:
{{- if .Values.docs.config }}
volumes:
Expand Down
2 changes: 1 addition & 1 deletion tooling/charts/tl500-course-content/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ crw:
# configMapName: tl500-docs-config
# configFileContent: |
# {
# "devfile_location": "https://raw.githubusercontent.com/rht-labs/enablement-framework/main/codereadyworkspaces/tl500-devfile.yaml"
# "devfile": "https://raw.githubusercontent.com/rht-labs/enablement-framework/main/codereadyworkspaces/tl500-devfile.yaml"
# }

stackrox-chart:
Expand Down

0 comments on commit edc6658

Please sign in to comment.