Skip to content
This repository was archived by the owner on Oct 28, 2024. It is now read-only.

Commit 03191fe

Browse files
authored
Merge pull request #115 from christopherhein/bug/105-sts-errors-release
πŸ› Fix permission issues and wrong control plane image
2 parents 2d30d2e + bf85d50 commit 03191fe

13 files changed

+23
-7
lines changed

β€ŽMakefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ release: clean-release ## Builds and push container images using the latest git
331331
$(MAKE) set-manifest-pull-policy PULL_POLICY=IfNotPresent TARGET_RESOURCE="./config/default/manager_pull_policy.yaml"
332332
# Set the control plane manifest image to the production bucket.
333333
$(MAKE) set-manifest-image \
334-
MANIFEST_IMG=$(PROD_REGISTRY)/$(IMAGE_NAME) MANIFEST_TAG=$(RELEASE_TAG) \
334+
MANIFEST_IMG=$(PROD_REGISTRY)/$(CONTROLPLANE_IMAGE_NAME) MANIFEST_TAG=$(RELEASE_TAG) \
335335
TARGET_RESOURCE="./controlplane/nested/config/default/manager_image_patch.yaml"
336336
$(MAKE) set-manifest-pull-policy PULL_POLICY=IfNotPresent TARGET_RESOURCE="./controlplane/nested/config/default/manager_pull_policy.yaml"
337337
## Build the manifests

β€Žconfig/manager/manager.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,4 @@ spec:
3737
cpu: 100m
3838
memory: 20Mi
3939
terminationGracePeriodSeconds: 10
40+
serviceAccountName: manager

β€Žconfig/rbac/auth_proxy_role_binding.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ roleRef:
88
name: proxy-role
99
subjects:
1010
- kind: ServiceAccount
11-
name: default
11+
name: manager
1212
namespace: system

β€Žconfig/rbac/kustomization.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
resources:
22
- role.yaml
33
- role_binding.yaml
4+
- service_account.yaml
45
- leader_election_role.yaml
56
- leader_election_role_binding.yaml
67
# Comment the following 4 lines if you want to disable

β€Žconfig/rbac/leader_election_role_binding.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ roleRef:
88
name: leader-election-role
99
subjects:
1010
- kind: ServiceAccount
11-
name: default
11+
name: manager
1212
namespace: system

β€Žconfig/rbac/role_binding.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ roleRef:
88
name: manager-role
99
subjects:
1010
- kind: ServiceAccount
11-
name: default
11+
name: manager
1212
namespace: system

β€Žconfig/rbac/service_account.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
apiVersion: v1
3+
kind: ServiceAccount
4+
metadata:
5+
name: manager
6+
namespace: system

β€Žcontrolplane/nested/config/manager/manager.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,4 @@ spec:
3737
cpu: 100m
3838
memory: 20Mi
3939
terminationGracePeriodSeconds: 10
40+
serviceAccountName: manager

β€Žcontrolplane/nested/config/rbac/auth_proxy_role_binding.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ roleRef:
88
name: proxy-role
99
subjects:
1010
- kind: ServiceAccount
11-
name: default
11+
name: manager
1212
namespace: system

β€Žcontrolplane/nested/config/rbac/kustomization.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
resources:
22
- role.yaml
33
- role_binding.yaml
4+
- service_account.yaml
45
- leader_election_role.yaml
56
- leader_election_role_binding.yaml
67
# Comment the following 4 lines if you want to disable

β€Žcontrolplane/nested/config/rbac/leader_election_role_binding.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ roleRef:
88
name: leader-election-role
99
subjects:
1010
- kind: ServiceAccount
11-
name: default
11+
name: manager
1212
namespace: system

β€Žcontrolplane/nested/config/rbac/role_binding.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ roleRef:
88
name: manager-role
99
subjects:
1010
- kind: ServiceAccount
11-
name: default
11+
name: manager
1212
namespace: system
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
apiVersion: v1
3+
kind: ServiceAccount
4+
metadata:
5+
name: manager
6+
namespace: system

0 commit comments

Comments
 (0)