Skip to content

Revert "Adding cert-manager to config/default." #358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ci/install-ci/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ patchesStrategicMerge:
kind: Deployment
metadata:
name: controller-manager
namespace: system
spec:
template:
spec:
Expand Down
5,535 changes: 0 additions & 5,535 deletions config/certmanager/certmanager.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions config/certmanager/kustomization.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ spec:
webhook:
clientConfig:
service:
namespace: system
name: webhook-service
path: /convert
conversionReviewVersions:
Expand Down
3 changes: 0 additions & 3 deletions config/crd/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

# This kustomization.yaml is not intended to be run by itself,
# since it depends on service name and namespace that are out of this kustomize package.
# It should be run by config/default
Expand Down
1 change: 1 addition & 0 deletions config/crd/patches/webhook_in_managedclustermodules.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ spec:
webhook:
clientConfig:
service:
namespace: system
name: webhook-service
path: /convert
conversionReviewVersions:
Expand Down
1 change: 1 addition & 0 deletions config/crd/patches/webhook_in_modules.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ spec:
webhook:
clientConfig:
service:
namespace: system
name: webhook-service
path: /convert
conversionReviewVersions:
Expand Down
3 changes: 0 additions & 3 deletions config/default-hub/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

# Adds namespace to all resources.
namespace: kmm-operator-system

Expand Down
18 changes: 3 additions & 15 deletions config/default/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
# Adds namespace to all resources.
namespace: kmm-operator-system

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

Expand Down Expand Up @@ -62,15 +62,3 @@ vars:
# kind: Service
# version: v1
# name: webhook-service

transformers:
- |-
apiVersion: builtin
kind: NamespaceTransformer
metadata:
name: notImportantHere
namespace: kmm-operator-system
unsetOnly: true
fieldSpecs:
- path: metadata/namespace
create: true
3 changes: 2 additions & 1 deletion config/manager-base/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ kind: Namespace
metadata:
labels:
control-plane: controller-manager
name: kmm-operator-system
name: system
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: controller-manager
namespace: system
labels:
control-plane: controller-manager
spec:
Expand Down
1 change: 1 addition & 0 deletions config/manager-base/manager_auth_proxy_patch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: controller-manager
namespace: system
spec:
template:
spec:
Expand Down
1 change: 1 addition & 0 deletions config/manager-base/manager_config_patch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: controller-manager
namespace: system
spec:
template:
spec:
Expand Down
4 changes: 1 addition & 3 deletions config/manifests-hub/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

# These resources constitute the fully configured set of manifests
# used to generate the 'manifests/' directory in a bundle.
resources:
Expand All @@ -18,6 +15,7 @@ resources:
# version: v1
# kind: Deployment
# name: controller-manager
# namespace: system
# patch: |-
# # Remove the manager container's "cert" volumeMount, since OLM will create and mount a set of certs.
# # Update the indices in this path if adding or removing containers/volumeMounts in the manager's Deployment.
Expand Down
4 changes: 1 addition & 3 deletions config/manifests/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

# These resources constitute the fully configured set of manifests
# used to generate the 'manifests/' directory in a bundle.
resources:
Expand All @@ -18,6 +15,7 @@ resources:
# version: v1
# kind: Deployment
# name: controller-manager
# namespace: system
# patch: |-
# # Remove the manager container's "cert" volumeMount, since OLM will create and mount a set of certs.
# # Update the indices in this path if adding or removing containers/volumeMounts in the manager's Deployment.
Expand Down
1 change: 1 addition & 0 deletions config/prometheus/monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
labels:
control-plane: controller-manager
name: controller-manager-metrics-monitor
namespace: system
spec:
endpoints:
- path: /metrics
Expand Down
1 change: 1 addition & 0 deletions config/rbac-base/auth_proxy_role_binding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ roleRef:
subjects:
- kind: ServiceAccount
name: controller-manager
namespace: system
1 change: 1 addition & 0 deletions config/rbac-base/auth_proxy_service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
labels:
control-plane: controller-manager
name: controller-manager-metrics-service
namespace: system
spec:
ports:
- name: https
Expand Down
3 changes: 0 additions & 3 deletions config/rbac-base/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

resources:
# All RBAC will be applied under this service account in
# the deployment namespace. You may comment out this resource
Expand Down
1 change: 1 addition & 0 deletions config/rbac-base/leader_election_role_binding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ roleRef:
subjects:
- kind: ServiceAccount
name: controller-manager
namespace: system
1 change: 1 addition & 0 deletions config/rbac-base/role_binding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ roleRef:
subjects:
- kind: ServiceAccount
name: controller-manager
namespace: system
1 change: 1 addition & 0 deletions config/rbac-base/service_account.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: controller-manager
namespace: system
3 changes: 0 additions & 3 deletions config/rbac-hub/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

resources:
- ../rbac-base
- role.yaml
3 changes: 0 additions & 3 deletions config/rbac/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

resources:
- ../rbac-base
- role.yaml
3 changes: 0 additions & 3 deletions config/scorecard/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

resources:
- bases/config.yaml
patchesJson6902:
Expand Down