File tree Expand file tree Collapse file tree 4 files changed +46
-13
lines changed Expand file tree Collapse file tree 4 files changed +46
-13
lines changed Original file line number Diff line number Diff line change @@ -12,3 +12,26 @@ patchesStrategicMerge:
12
12
- overlays/rbac-manager.yaml
13
13
- overlays/vault-manager.yaml
14
14
- overlays/workloads-manager.yaml
15
+
16
+ # Sadly we must repeat the replacement as in our root Kustomization, because we've
17
+ # overriden the image field, and there's no way to get Kustomize to run the (merged) replacements
18
+ # after (merged) patches.
19
+ replacements :
20
+ - source :
21
+ fieldPath : spec.template.spec.containers.[name=manager].image
22
+ group : apps
23
+ version : v1
24
+ kind : StatefulSet
25
+ name : theatre-vault-manager
26
+ namespace : theatre-system
27
+ targets :
28
+ - select :
29
+ group : apps
30
+ kind : StatefulSet
31
+ name : vault-manager
32
+ version : v1
33
+ fieldPaths :
34
+ - spec.template.spec.containers.0.args.0
35
+ options :
36
+ delimiter : =
37
+ index : 1
Original file line number Diff line number Diff line change 11
11
- name : manager
12
12
image : theatre:latest
13
13
imagePullPolicy : Never
14
- args :
15
- - --theatre-image=$(THEATRE_IMAGE)
16
- - --metrics-address=0.0.0.0
17
14
resources :
18
15
requests :
19
16
cpu : " 100m"
Original file line number Diff line number Diff line change @@ -5,8 +5,10 @@ kind: Kustomization
5
5
namespace : theatre-system
6
6
namePrefix : theatre-
7
7
8
- commonLabels :
9
- app : theatre
8
+ labels :
9
+ - includeSelectors : true
10
+ pairs :
11
+ app : theatre
10
12
11
13
resources :
12
14
- crds/rbac.crd.gocardless.com_directoryrolebindings.yaml
@@ -22,16 +24,27 @@ resources:
22
24
- rbac/leader-election.yaml
23
25
- cert-manager/certificate.yaml
24
26
25
- vars :
27
+ replacements :
26
28
# We want our mutating webhook to ensure it only ever configures pods to use
27
29
# the same image as it is running itself. If we ensure this, we don't need to
28
30
# worry about maintaining compatibility between versions of the webhook and
29
31
# theatre-secrets, as both will use the same version and be deployed
30
32
# atomically.
31
- - name : THEATRE_IMAGE
32
- objref :
33
- apiVersion : apps/v1
33
+ - source :
34
+ fieldPath : spec.template.spec.containers.[name=manager].image
35
+ group : apps
36
+ version : v1
34
37
kind : StatefulSet
35
- name : vault-manager
36
- fieldref :
37
- fieldpath : spec.template.spec.containers[0].image
38
+ name : theatre-vault-manager
39
+ namespace : theatre-system
40
+ targets :
41
+ - select :
42
+ group : apps
43
+ kind : StatefulSet
44
+ name : vault-manager
45
+ version : v1
46
+ fieldPaths :
47
+ - spec.template.spec.containers.0.args.0
48
+ options :
49
+ delimiter : =
50
+ index : 1
Original file line number Diff line number Diff line change @@ -113,7 +113,7 @@ spec:
113
113
- command :
114
114
- /usr/local/bin/vault-manager
115
115
args :
116
- - --theatre-image=$(THEATRE_IMAGE)
116
+ - --theatre-image=THEATRE_IMAGE_PLACEHOLDER
117
117
- --metrics-address=0.0.0.0
118
118
image : eu.gcr.io/gc-containers/gocardless/theatre:latest
119
119
imagePullPolicy : Always
You can’t perform that action at this time.
0 commit comments