Skip to content

Commit e201667

Browse files
committed
Fixed notes
1 parent 8945c2a commit e201667

File tree

1 file changed

+23
-11
lines changed

1 file changed

+23
-11
lines changed

tools/manifests/manifest_builder.go

+23-11
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,9 @@ description: |
117117
home: https://arangodb.com
118118
`
119119
kubeArangoDBValuesTemplate = `
120+
# Image containing the kube-arangodb operators
120121
Image: {{ .Image | quote }}
122+
# Image pull policy for Image
121123
ImagePullPolicy: {{ .ImagePullPolicy | quote }}
122124
RBAC:
123125
Create: {{ .RBAC }}
@@ -149,23 +151,27 @@ Storage:
149151
ServiceAccountName: {{ .Storage.Operator.ServiceAccountName | quote }}
150152
ServiceType: {{ .Storage.Operator.ServiceType | quote }}
151153
`
152-
kubeArangoDBNotesTemplate = `
154+
kubeArangoDBNotesText = `
153155
kube-arangodb has been deployed successfully!
154156
155-
{{ if (and .Deployment.Create .DeploymentReplication.Create) -}}
157+
Your release is named '{{ .Release.Name }}'.
158+
159+
{{ if and .Values.Deployment.Create .Values.DeploymentReplication.Create -}}
156160
You can now deploy ArangoDeployment & ArangoDeploymentReplication resources.
157-
{{- else if (and .Deployment.Create (not .DeploymentReplication.Create)) -}}
161+
{{- else if and .Values.Deployment.Create (not .Values.DeploymentReplication.Create) -}}
158162
You can now deploy ArangoDeployment resources.
159-
{{- else if (and (not .Deployment.Create) .DeploymentReplication.Create) -}}
163+
{{- else if and (not .Values.Deployment.Create) .Values.DeploymentReplication.Create -}}
160164
You can now deploy ArangoDeploymentReplication resources.
161165
{{- end }}
162166
163167
See https://docs.arangodb.com/devel/Manual/Tutorials/Kubernetes/
164168
for how to get started.
165169
`
166-
kubeArangoDBStorageNotesTemplate = `
170+
kubeArangoDBStorageNotesText = `
167171
kube-arangodb-storage has been deployed successfully!
168172
173+
Your release is named '{{ .Release.Name }}'.
174+
169175
You can now deploy an ArangoLocalStorage resource.
170176
171177
See https://docs.arangodb.com/devel/Manual/Deployment/Kubernetes/StorageResource.html
@@ -178,12 +184,12 @@ var (
178184
"kube-arangodb": chartTemplates{
179185
"Chart.yaml": kubeArangoDBChartTemplate,
180186
"values.yaml": kubeArangoDBValuesTemplate,
181-
"templates/NOTES.txt": kubeArangoDBNotesTemplate,
187+
"templates/NOTES.txt": kubeArangoDBNotesText,
182188
},
183189
"kube-arangodb-storage": chartTemplates{
184190
"Chart.yaml": kubeArangoDBStorageChartTemplate,
185191
"values.yaml": kubeArangoDBStorageValuesTemplate,
186-
"templates/NOTES.txt": kubeArangoDBStorageNotesTemplate,
192+
"templates/NOTES.txt": kubeArangoDBStorageNotesText,
187193
},
188194
}
189195
)
@@ -490,11 +496,17 @@ func main() {
490496
for groupName, chartTemplates := range chartTemplateGroups {
491497
for name, templateSource := range chartTemplates {
492498
output := &bytes.Buffer{}
493-
t, err := template.New(name).Funcs(tmplFuncs).Parse(templateSource)
494-
if err != nil {
495-
log.Fatalf("Failed to parse template %s: %v", name, err)
499+
if strings.HasSuffix(name, ".txt") {
500+
// Plain text
501+
output.WriteString(templateSource)
502+
} else {
503+
// Template
504+
t, err := template.New(name).Funcs(tmplFuncs).Parse(templateSource)
505+
if err != nil {
506+
log.Fatalf("Failed to parse template %s: %v", name, err)
507+
}
508+
t.Execute(output, templateOptions)
496509
}
497-
t.Execute(output, templateOptions)
498510

499511
// Save output
500512
tarPath := path.Join(groupName, name)

0 commit comments

Comments
 (0)