Skip to content

Fix single quotes dropped #155

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

Merged
arttor merged 4 commits into from
Nov 17, 2024
Merged

Fix single quotes dropped #155

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d2f3687
added regex to replace specific quote char
Greendor1234 Nov 14, 2024
15e3af4
updated chart example
Greendor1234 Nov 14, 2024
1034a16
changed variable name
Greendor1234 Nov 14, 2024
250a67c
added unit test
Greendor1234 Nov 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
10 changes: 9 additions & 1 deletion examples/app/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,14 @@ spec:
secretKeyRef:
key: VAR2
name: {{ include "app.fullname" . }}-my-secret-vars
- name: APP_NAME
valueFrom:
fieldRef:
fieldPath: metadata.labels['app.kubernetes.io/name']
- name: INSTANCE_NAME
valueFrom:
fieldRef:
fieldPath: metadata.labels['app.kubernetes.io/instance']
- name: KUBERNETES_CLUSTER_DOMAIN
value: {{ quote .Values.kubernetesClusterDomain }}
image: {{ .Values.myapp.app.image.repository }}:{{ .Values.myapp.app.image.tag
Expand Down Expand Up @@ -78,7 +86,7 @@ spec:
- command:
- /bin/sh
- -c
- echo Initializing container...
- echo 'Initializing container...'
env:
- name: KUBERNETES_CLUSTER_DOMAIN
value: {{ quote .Values.kubernetesClusterDomain }}
Expand Down
4 changes: 3 additions & 1 deletion pkg/processor/deployment/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package deployment
import (
"fmt"
"io"
"regexp"
"strings"
"text/template"

Expand Down Expand Up @@ -129,7 +130,8 @@ func (d deployment) Process(appMeta helmify.AppMetadata, obj *unstructured.Unstr
return true, nil, err
}

spec = strings.ReplaceAll(spec, "'", "")
r := regexp.MustCompile(`'({{((.*|.*\n.*))}}.*)'`)
spec = r.ReplaceAllString(spec, "${1}")

return true, &result{
values: values,
Expand Down
4 changes: 4 additions & 0 deletions pkg/processor/deployment/deployment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ spec:
resource: limits.cpu
- name: VAR5
value: "123"
- name: VAR6
valueFrom:
fieldRef:
fieldPath: metadata.labels['app.kubernetes.io/something']
image: controller:latest
livenessProbe:
httpGet:
Expand Down
8 changes: 8 additions & 0 deletions test_data/sample-app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,14 @@ spec:
secretKeyRef:
name: my-secret-vars
key: VAR2
- name: APP_NAME
valueFrom:
fieldRef:
fieldPath: metadata.labels['app.kubernetes.io/name']
- name: INSTANCE_NAME
valueFrom:
fieldRef:
fieldPath: metadata.labels['app.kubernetes.io/instance']
image: controller:latest
livenessProbe:
httpGet:
Expand Down