Skip to content

Commit a9cc35f

Browse files
sf1tzparttor
authored andcommitted
Add Type field to Secret, and some test data
1 parent 2535f20 commit a9cc35f

File tree

2 files changed

+30
-1
lines changed

2 files changed

+30
-1
lines changed

pkg/processor/secret/secret.go

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ var secretTempl, _ = template.New("secret").Parse(
2424
{{- end }}
2525
{{- if .StringData }}
2626
{{ .StringData }}
27+
{{- end }}
28+
{{- if .Type }}
29+
{{ .Type }}
2730
{{- end }}`)
2831

2932
var configMapGVC = schema.GroupVersionKind{
@@ -56,6 +59,15 @@ func (d secret) Process(appMeta helmify.AppMetadata, obj *unstructured.Unstructu
5659

5760
name := appMeta.TrimName(obj.GetName())
5861
nameCamelCase := strcase.ToLowerCamel(name)
62+
63+
secretType := string(sec.Type)
64+
if secretType != "" {
65+
secretType, err = yamlformat.Marshal(map[string]interface{}{"type": secretType}, 0)
66+
if err != nil {
67+
return true, nil, err
68+
}
69+
}
70+
5971
values := helmify.Values{}
6072
var data, stringData string
6173
templatedData := map[string]string{}
@@ -101,17 +113,19 @@ func (d secret) Process(appMeta helmify.AppMetadata, obj *unstructured.Unstructu
101113
return true, &result{
102114
name: name + ".yaml",
103115
data: struct {
116+
Type string
104117
Meta string
105118
Data string
106119
StringData string
107-
}{Meta: meta, Data: data, StringData: stringData},
120+
}{Type: secretType, Meta: meta, Data: data, StringData: stringData},
108121
values: values,
109122
}, nil
110123
}
111124

112125
type result struct {
113126
name string
114127
data struct {
128+
Type string
115129
Meta string
116130
Data string
117131
StringData string

test_data/k8s-operator-kustomize.output

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -571,6 +571,8 @@ spec:
571571
labels:
572572
control-plane: controller-manager
573573
spec:
574+
imagePullSecrets:
575+
- name: my-operator-secret-registry-credentials
574576
containers:
575577
- args:
576578
- --secure-listen-address=0.0.0.0:8443
@@ -716,6 +718,19 @@ metadata:
716718
type: opaque
717719
---
718720
apiVersion: v1
721+
data:
722+
.dockerconfigjson: |
723+
ewogICAgImF1dGhzIjogewogICAgICAgICJmb28uYmFyLmlvIjogewogICAgICAgICAgIC
724+
AidXNlcm5hbWUiOiAidXNlcm5hbWUiLAogICAgICAgICAgICAicGFzc3dvcmQiOiAic2Vj
725+
cmV0IiwKICAgICAgICAgICAgImF1dGgiOiAiZFhObGNtNWhiV1U2YzJWamNtVjAiCiAgIC
726+
AgICAgfQogICAgfQp9
727+
kind: Secret
728+
metadata:
729+
name: my-operator-secret-registry-credentials
730+
namespace: my-operator-system
731+
type: kubernetes.io/dockerconfigjson
732+
---
733+
apiVersion: v1
719734
data:
720735
VAR1: bXlfc2VjcmV0X3Zhcl8x
721736
VAR2: bXlfc2VjcmV0X3Zhcl8y

0 commit comments

Comments
 (0)