Skip to content

Commit 8004bbe

Browse files
committed
chore: fix kustomization
Signed-off-by: Andrew Rynhard <[email protected]>
1 parent eee4308 commit 8004bbe

File tree

7 files changed

+38
-51
lines changed

7 files changed

+38
-51
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ ARG TAG
4040
RUN cd config/manager \
4141
&& kustomize edit set image controller=${REGISTRY_AND_USERNAME}/${NAME}:${TAG} \
4242
&& cd - \
43-
&& kubectl kustomize config/default >/release.yaml
43+
&& kubectl kustomize config >/release.yaml
4444
FROM scratch AS release
4545
COPY --from=release-build /release.yaml /release.yaml
4646

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
4242
kind: Kustomization
4343
namespace: $(NAMESPACE)
4444
commonLabels:
45-
app: cluster-api-talos-controller
45+
app: $(NAME)
4646
bases:
4747
- crd
4848
- rbac

config/default/kustomization.yaml

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,38 @@
11
# Adds namespace to all resources.
2-
namespace: cabpt-system
2+
namespace: tmp-system
33

44
# Value of this field is prepended to the
55
# names of all resources, e.g. a deployment named
66
# "wordpress" becomes "alices-wordpress".
77
# Note that it should also match with the prefix (text before '-') of the namespace
88
# field above.
9-
namePrefix: cabpt-
9+
namePrefix: tmp-
1010

1111
# Labels to add to all resources and selectors.
1212
#commonLabels:
1313
# someName: someValue
1414

1515
bases:
16-
- ../crd
17-
- ../rbac
18-
- ../manager
16+
- ../crd
17+
- ../rbac
18+
- ../manager
1919
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in crd/kustomization.yaml
2020
#- ../webhook
2121
# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'. 'WEBHOOK' components are required.
2222
#- ../certmanager
23-
# [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'.
23+
# [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'.
2424
#- ../prometheus
2525

2626
patchesStrategicMerge:
27-
- manager_image_patch.yaml
2827
# Protect the /metrics endpoint by putting it behind auth.
2928
# Only one of manager_auth_proxy_patch.yaml and
3029
# manager_prometheus_metrics_patch.yaml should be enabled.
31-
- manager_auth_proxy_patch.yaml
32-
# If you want your controller-manager to expose the /metrics
33-
# endpoint w/o any authn/z, uncomment the following line and
34-
# comment manager_auth_proxy_patch.yaml.
35-
# Only one of manager_auth_proxy_patch.yaml and
36-
# manager_prometheus_metrics_patch.yaml should be enabled.
30+
- manager_auth_proxy_patch.yaml
31+
# If you want your controller-manager to expose the /metrics
32+
# endpoint w/o any authn/z, uncomment the following line and
33+
# comment manager_auth_proxy_patch.yaml.
34+
# Only one of manager_auth_proxy_patch.yaml and
35+
# manager_prometheus_metrics_patch.yaml should be enabled.
3736
#- manager_prometheus_metrics_patch.yaml
3837

3938
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in crd/kustomization.yaml

config/default/manager_image_patch.yaml

Lines changed: 0 additions & 12 deletions
This file was deleted.

config/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
namespace: cabpt-system
44
commonLabels:
5-
app: cluster-api-talos-controller
5+
control-plane: cabpt-controller-manager
66
bases:
77
- crd
88
- rbac

config/manager/manager.yaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@ spec:
2323
control-plane: controller-manager
2424
spec:
2525
containers:
26-
- command:
27-
- /manager
28-
args:
29-
- --enable-leader-election
30-
image: controller:latest
31-
name: manager
32-
resources:
33-
limits:
34-
cpu: 500m
35-
memory: 500Mi
36-
requests:
37-
cpu: 500m
38-
memory: 500Mi
26+
- command:
27+
- /manager
28+
args:
29+
- --enable-leader-election
30+
image: controller:latest
31+
name: manager
32+
resources:
33+
limits:
34+
cpu: 500m
35+
memory: 500Mi
36+
requests:
37+
cpu: 500m
38+
memory: 500Mi
3939
terminationGracePeriodSeconds: 10

config/rbac/kustomization.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
resources:
2-
- role.yaml
3-
- role_binding.yaml
4-
- leader_election_role.yaml
5-
- leader_election_role_binding.yaml
6-
# Comment the following 3 lines if you want to disable
7-
# the auth proxy (https://github.com/brancz/kube-rbac-proxy)
8-
# which protects your /metrics endpoint.
9-
- auth_proxy_service.yaml
10-
- auth_proxy_role.yaml
11-
- auth_proxy_role_binding.yaml
2+
- role.yaml
3+
- role_binding.yaml
4+
- leader_election_role.yaml
5+
- leader_election_role_binding.yaml
6+
# Comment the following 3 lines if you want to disable
7+
# the auth proxy (https://github.com/brancz/kube-rbac-proxy)
8+
# which protects your /metrics endpoint.
9+
- auth_proxy_service.yaml
10+
- auth_proxy_role.yaml
11+
- auth_proxy_role_binding.yaml

0 commit comments

Comments
 (0)