File tree Expand file tree Collapse file tree 5 files changed +48
-6
lines changed
manifests/stackset-controller Expand file tree Collapse file tree 5 files changed +48
-6
lines changed Original file line number Diff line number Diff line change @@ -903,6 +903,9 @@ stackset_configmap_support_enabled: "true"
903
903
stackset_configmap_support_enabled : " false"
904
904
{{end}}
905
905
906
+ # enable/disable secret support for stackset
907
+ stackset_secret_support_enabled : " false"
908
+
906
909
# enable/disable traffic segment support for stackset
907
910
{{if eq .Cluster.Environment "e2e"}}
908
911
stackset_enable_traffic_segments : " true"
Original file line number Diff line number Diff line change @@ -349,7 +349,7 @@ spec:
349
349
- maxReplicas
350
350
- metrics
351
351
type : object
352
- {{- if eq .Cluster.ConfigItems.stackset_configmap_support_enabled "true" }}
352
+ {{- if or ( eq .Cluster.ConfigItems.stackset_configmap_support_enabled "true") (eq .Cluster.ConfigItems.stackset_secret_support_enabled "true") }}
353
353
configurationResources :
354
354
description : ConfigurationResources describes the ConfigMaps that
355
355
will be created. Later Secrets and PlatformCredentialSets will also
@@ -358,8 +358,19 @@ spec:
358
358
description : ConfigurationResourcesSpec makes it possible to defined
359
359
the config resources to be created
360
360
properties :
361
+ {{- if eq .Cluster.ConfigItems.stackset_configmap_support_enabled "true" }}
361
362
configMapRef :
362
- description : ConfigMap to be versioned for Stack
363
+ description : ConfigMap to be owned by Stack
364
+ properties :
365
+ name :
366
+ description : ' Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
367
+ TODO: Add other useful fields. apiVersion, kind, uid?'
368
+ type : string
369
+ type : object
370
+ {{ end }}
371
+ {{- if eq .Cluster.ConfigItems.stackset_secret_support_enabled "true" }}
372
+ secretRef :
373
+ description : Secret to be owned by Stack
363
374
properties :
364
375
name :
365
376
description : ' Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
@@ -368,6 +379,7 @@ spec:
368
379
type : object
369
380
type : object
370
381
type : array
382
+ {{ end }}
371
383
{{ end }}
372
384
externalIngress :
373
385
description : Stack specific ExternalIngress, based on the parent StackSet
Original file line number Diff line number Diff line change @@ -596,7 +596,7 @@ spec:
596
596
- maxReplicas
597
597
- metrics
598
598
type: object
599
- {{- if eq .Cluster.ConfigItems.stackset_configmap_support_enabled "true" }}
599
+ {{- if or ( eq .Cluster.ConfigItems.stackset_configmap_support_enabled "true") (eq .Cluster.ConfigItems.stackset_secret_support_enabled "true") }}
600
600
configurationResources:
601
601
description: ConfigurationResources describes the ConfigMaps
602
602
that will be created. Later Secrets and PlatformCredentialSets
@@ -605,8 +605,20 @@ spec:
605
605
description: ConfigurationResourcesSpec makes it possible
606
606
to defined the config resources to be created
607
607
properties:
608
+ {{- if eq .Cluster.ConfigItems.stackset_configmap_support_enabled "true" }}
608
609
configMapRef:
609
- description: ConfigMap to be versioned for Stack
610
+ description: ConfigMap to be owned by Stack
611
+ properties:
612
+ name:
613
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
614
+ TODO: Add other useful fields. apiVersion, kind,
615
+ uid?'
616
+ type: string
617
+ type: object
618
+ {{ end }}
619
+ {{- if eq .Cluster.ConfigItems.stackset_secret_support_enabled "true" }}
620
+ secretRef:
621
+ description: Secret to be owned by Stack
610
622
properties:
611
623
name:
612
624
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
@@ -616,6 +628,7 @@ spec:
616
628
type: object
617
629
type: object
618
630
type: array
631
+ {{ end }}
619
632
{{ end }}
620
633
minReadySeconds:
621
634
description: Minimum number of seconds for which a newly created
Original file line number Diff line number Diff line change 1
- {{ $version := "v1.4.27 " }}
1
+ {{ $version := "pr-565-26 " }}
2
2
apiVersion : apps/v1
3
3
kind : Deployment
4
4
metadata :
30
30
serviceAccountName : stackset-controller
31
31
containers :
32
32
- name : stackset-controller
33
- image : " container-registry.zalando.net/teapot/stackset-controller:{{ $version }}"
33
+ image : " container-registry-test .zalando.net/teapot/stackset-controller:{{ $version }}"
34
34
args :
35
35
- " --interval={{ .Cluster.ConfigItems.stackset_controller_sync_interval }}"
36
36
{{- if eq .Cluster.ConfigItems.stackset_routegroup_support_enabled "true" }}
40
40
{{- if eq .Cluster.ConfigItems.stackset_configmap_support_enabled "true" }}
41
41
- " --enable-configmap-support"
42
42
{{- end }}
43
+ {{- if eq .Cluster.ConfigItems.stackset_secret_support_enabled "true" }}
44
+ - " --enable-secret-support"
45
+ {{- end }}
43
46
{{- if eq .Cluster.ConfigItems.stackset_enable_traffic_segments "true" }}
44
47
- " --enable-traffic-segments"
45
48
{{- end }}
Original file line number Diff line number Diff line change @@ -110,6 +110,17 @@ rules:
110
110
- create
111
111
- update
112
112
{{- end }}
113
+ {{- if eq .Cluster.ConfigItems.stackset_secret_support_enabled "true" }}
114
+ - apiGroups :
115
+ - " "
116
+ resources :
117
+ - secrets
118
+ verbs :
119
+ - get
120
+ - list
121
+ - create
122
+ - update
123
+ {{- end }}
113
124
---
114
125
apiVersion : rbac.authorization.k8s.io/v1
115
126
kind : ClusterRoleBinding
You can’t perform that action at this time.
0 commit comments