Skip to content

Commit 4939748

Browse files
authored
Revert "Adding cert-manager to config/default. (#355)"
This reverts commit a1911f9.
1 parent a1911f9 commit 4939748

24 files changed

+19
-5580
lines changed

ci/install-ci/kustomization.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ patchesStrategicMerge:
1515
kind: Deployment
1616
metadata:
1717
name: controller-manager
18+
namespace: system
1819
spec:
1920
template:
2021
spec:

config/certmanager/certmanager.yaml

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

config/certmanager/kustomization.yaml

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

config/crd-hub/patches/webhook_in_managedclustermodules.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ spec:
99
webhook:
1010
clientConfig:
1111
service:
12+
namespace: system
1213
name: webhook-service
1314
path: /convert
1415
conversionReviewVersions:

config/crd/kustomization.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
apiVersion: kustomize.config.k8s.io/v1beta1
2-
kind: Kustomization
3-
41
# This kustomization.yaml is not intended to be run by itself,
52
# since it depends on service name and namespace that are out of this kustomize package.
63
# It should be run by config/default

config/crd/patches/webhook_in_managedclustermodules.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ spec:
99
webhook:
1010
clientConfig:
1111
service:
12+
namespace: system
1213
name: webhook-service
1314
path: /convert
1415
conversionReviewVersions:

config/crd/patches/webhook_in_modules.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ spec:
99
webhook:
1010
clientConfig:
1111
service:
12+
namespace: system
1213
name: webhook-service
1314
path: /convert
1415
conversionReviewVersions:

config/default-hub/kustomization.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
apiVersion: kustomize.config.k8s.io/v1beta1
2-
kind: Kustomization
3-
41
# Adds namespace to all resources.
52
namespace: kmm-operator-system
63

config/default/kustomization.yaml

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
apiVersion: kustomize.config.k8s.io/v1beta1
2-
kind: Kustomization
1+
# Adds namespace to all resources.
2+
namespace: kmm-operator-system
33

44
# Value of this field is prepended to the
55
# names of all resources, e.g. a deployment named
@@ -20,7 +20,7 @@ bases:
2020
# crd/kustomization.yaml
2121
#- ../webhook
2222
# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'. 'WEBHOOK' components are required.
23-
- ../certmanager
23+
#- ../certmanager
2424
# [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'.
2525
#- ../prometheus
2626

@@ -62,15 +62,3 @@ vars:
6262
# kind: Service
6363
# version: v1
6464
# name: webhook-service
65-
66-
transformers:
67-
- |-
68-
apiVersion: builtin
69-
kind: NamespaceTransformer
70-
metadata:
71-
name: notImportantHere
72-
namespace: kmm-operator-system
73-
unsetOnly: true
74-
fieldSpecs:
75-
- path: metadata/namespace
76-
create: true

config/manager-base/manager.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ kind: Namespace
33
metadata:
44
labels:
55
control-plane: controller-manager
6-
name: kmm-operator-system
6+
name: system
77
---
88
apiVersion: apps/v1
99
kind: Deployment
1010
metadata:
1111
name: controller-manager
12+
namespace: system
1213
labels:
1314
control-plane: controller-manager
1415
spec:

config/manager-base/manager_auth_proxy_patch.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ apiVersion: apps/v1
44
kind: Deployment
55
metadata:
66
name: controller-manager
7+
namespace: system
78
spec:
89
template:
910
spec:

config/manager-base/manager_config_patch.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: apps/v1
22
kind: Deployment
33
metadata:
44
name: controller-manager
5+
namespace: system
56
spec:
67
template:
78
spec:

config/manifests-hub/kustomization.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
apiVersion: kustomize.config.k8s.io/v1beta1
2-
kind: Kustomization
3-
41
# These resources constitute the fully configured set of manifests
52
# used to generate the 'manifests/' directory in a bundle.
63
resources:
@@ -18,6 +15,7 @@ resources:
1815
# version: v1
1916
# kind: Deployment
2017
# name: controller-manager
18+
# namespace: system
2119
# patch: |-
2220
# # Remove the manager container's "cert" volumeMount, since OLM will create and mount a set of certs.
2321
# # Update the indices in this path if adding or removing containers/volumeMounts in the manager's Deployment.

config/manifests/kustomization.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
apiVersion: kustomize.config.k8s.io/v1beta1
2-
kind: Kustomization
3-
41
# These resources constitute the fully configured set of manifests
52
# used to generate the 'manifests/' directory in a bundle.
63
resources:
@@ -18,6 +15,7 @@ resources:
1815
# version: v1
1916
# kind: Deployment
2017
# name: controller-manager
18+
# namespace: system
2119
# patch: |-
2220
# # Remove the manager container's "cert" volumeMount, since OLM will create and mount a set of certs.
2321
# # Update the indices in this path if adding or removing containers/volumeMounts in the manager's Deployment.

config/prometheus/monitor.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ metadata:
66
labels:
77
control-plane: controller-manager
88
name: controller-manager-metrics-monitor
9+
namespace: system
910
spec:
1011
endpoints:
1112
- path: /metrics

config/rbac-base/auth_proxy_role_binding.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ roleRef:
99
subjects:
1010
- kind: ServiceAccount
1111
name: controller-manager
12+
namespace: system

config/rbac-base/auth_proxy_service.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ metadata:
44
labels:
55
control-plane: controller-manager
66
name: controller-manager-metrics-service
7+
namespace: system
78
spec:
89
ports:
910
- name: https

config/rbac-base/kustomization.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
apiVersion: kustomize.config.k8s.io/v1beta1
2-
kind: Kustomization
3-
41
resources:
52
# All RBAC will be applied under this service account in
63
# the deployment namespace. You may comment out this resource

config/rbac-base/leader_election_role_binding.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ roleRef:
99
subjects:
1010
- kind: ServiceAccount
1111
name: controller-manager
12+
namespace: system

config/rbac-base/role_binding.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ roleRef:
99
subjects:
1010
- kind: ServiceAccount
1111
name: controller-manager
12+
namespace: system

config/rbac-base/service_account.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ apiVersion: v1
22
kind: ServiceAccount
33
metadata:
44
name: controller-manager
5+
namespace: system

config/rbac-hub/kustomization.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
apiVersion: kustomize.config.k8s.io/v1beta1
2-
kind: Kustomization
3-
41
resources:
52
- ../rbac-base
63
- role.yaml

config/rbac/kustomization.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
apiVersion: kustomize.config.k8s.io/v1beta1
2-
kind: Kustomization
3-
41
resources:
52
- ../rbac-base
63
- role.yaml

config/scorecard/kustomization.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
apiVersion: kustomize.config.k8s.io/v1beta1
2-
kind: Kustomization
3-
41
resources:
52
- bases/config.yaml
63
patchesJson6902:

0 commit comments

Comments
 (0)