Skip to content

Commit c6a2fed

Browse files
authored
🌱 OPRUN-4077: Remove the kustomize config (#2213)
* Remove the kustomize config Add a helm/OWNERS file (copied from config/OWNERS) Update hack/tools/update-crds.sh to not reference config directory Signed-off-by: Todd Short <[email protected]> * Fixup unit test config paths Signed-off-by: Todd Short <[email protected]> * Update CRD locations for crd-diff Signed-off-by: Todd Short <[email protected]> --------- Signed-off-by: Todd Short <[email protected]>
1 parent 6332ae3 commit c6a2fed

File tree

133 files changed

+21
-4436
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+21
-4436
lines changed

Makefile

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,6 @@ else
7171
$(warning Could not find docker or podman in path! This may result in targets requiring a container runtime failing!)
7272
endif
7373

74-
KUSTOMIZE_STANDARD_OVERLAY := config/overlays/standard
75-
KUSTOMIZE_STANDARD_E2E_OVERLAY := config/overlays/standard-e2e
76-
KUSTOMIZE_EXPERIMENTAL_OVERLAY := config/overlays/experimental
77-
KUSTOMIZE_EXPERIMENTAL_E2E_OVERLAY := config/overlays/experimental-e2e
78-
7974
export STANDARD_RELEASE_MANIFEST := operator-controller.yaml
8075
export STANDARD_RELEASE_INSTALL := install.sh
8176
export EXPERIMENTAL_RELEASE_MANIFEST := operator-controller-experimental.yaml
@@ -204,8 +199,8 @@ bingo-upgrade: $(BINGO) #EXHELP Upgrade tools
204199
.PHONY: verify-crd-compatibility
205200
CRD_DIFF_ORIGINAL_REF := git://main?path=
206201
CRD_DIFF_UPDATED_REF := file://
207-
CRD_DIFF_OPCON_SOURCE := config/base/operator-controller/crd/standard/olm.operatorframework.io_clusterextensions.yaml
208-
CRD_DIFF_CATD_SOURCE := config/base/catalogd/crd/standard/olm.operatorframework.io_clustercatalogs.yaml
202+
CRD_DIFF_OPCON_SOURCE := helm/olmv1/base/operator-controller/crd/standard/olm.operatorframework.io_clusterextensions.yaml
203+
CRD_DIFF_CATD_SOURCE := helm/olmv1/base/catalogd/crd/standard/olm.operatorframework.io_clustercatalogs.yaml
209204
CRD_DIFF_CONFIG := crd-diff-config.yaml
210205
verify-crd-compatibility: $(CRD_DIFF) manifests
211206
$(CRD_DIFF) --config="${CRD_DIFF_CONFIG}" "${CRD_DIFF_ORIGINAL_REF}${CRD_DIFF_OPCON_SOURCE}" ${CRD_DIFF_UPDATED_REF}${CRD_DIFF_OPCON_SOURCE}

api/v1/clustercatalog_types_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"sigs.k8s.io/yaml"
2121
)
2222

23-
const crdFilePath = "../../config/base/catalogd/crd/standard/olm.operatorframework.io_clustercatalogs.yaml"
23+
const crdFilePath = "../../helm/olmv1/base/catalogd/crd/standard/olm.operatorframework.io_clustercatalogs.yaml"
2424

2525
func TestImageSourceCELValidationRules(t *testing.T) {
2626
validators := fieldValidatorsFromFile(t, crdFilePath)

config/README.md

Lines changed: 1 addition & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,5 @@
11
# OPERATOR-CONTROLLER CONFIGURATION
22

3-
The main kustomize targets are all located in the `config/overlays` directory. These are the directories that should be passed to kustomize:
4-
5-
e.g.
6-
```
7-
kustomize build config/overlays/standard > standard.yaml
8-
```
9-
10-
# Overlays
11-
12-
All other directories are in support of of these overlays.
13-
14-
## config/overlays/basic-olm
15-
16-
This includes basic support for an insecure (non-TLS) OLMv1 deployment.
17-
18-
## config/overlays/standard
19-
20-
This includes support for a secure (i.e. with TLS) configuration of OLMv1. This configuration requires cert-manager.
21-
22-
This configuration is used to generate `manifests/standard.yaml`.
23-
24-
## config/overlays/standard-e2e
25-
26-
This provides additional configuration support for end-to-end testing, including code coverage. This configuration requires cert-manager.
27-
28-
This configuration is used to generate `manifests/standard-e2e.yaml`.
29-
30-
## config/overlays/prometheus
31-
32-
Overlay containing manifest files which enable prometheus scraping of the catalogd and operator-controller pods. Used during e2e runs to measure performance over the lifetime of the test.
33-
34-
These manifests will not end up in the `manifests/` folder, as they must be applied in two distinct steps to avoid issues with applying prometheus CRDs and CRs simultaneously.
35-
36-
Performance alert settings can be found in: `config/overlays/prometheus/prometheus_rule.yaml`
37-
38-
## config/overlays/experimental
39-
40-
This provides additional configuration used to support experimental features, including CRDs. This configuration requires cert-manager.
41-
42-
This configuration is used to generate `manifests/experimental.yaml`.
43-
44-
## config/overlays/experimental-e2e
45-
46-
This provides experimental configuration and support for end-to-end testing, includng code coverage. This configuration requires cert-manager.
47-
48-
This configuration is used to generate `manifests/experimental-e2e.yaml`.
49-
50-
## config/overlays/tilt-local-dev
51-
52-
This provides configuration for Tilt debugging support.
53-
54-
# Components
55-
56-
Components are the kustomize configuration building blocks.
57-
58-
## config/components/base
59-
60-
This directory provides multiple configurations for organizing the base configuration into standard and experimental configurations.
61-
62-
:bangbang: *The following rules should be followed when configurating a feature:*
63-
64-
* Feature components that are GA'd and should be part of the standard manifest should be listed in `config/components/base/common/kustomization.yaml`. This `commmon` kustomization file is included by *both* the **standard** and **experimental** configurations.
65-
* Feature components that are still experimental and should be part of the standard manifest should be listed only in `config/components/base/experimental/kustomization.yaml`.
66-
67-
## config/components/features
68-
69-
This directory contains contains configuration for features (experimental or otherwise).
70-
71-
:bangbang: *Feature configuration should be placed into a subdirectory here.*
72-
73-
## config/components/cert-manager
74-
75-
This directory provides configuration for using cert-manager with OLMv1.
76-
77-
## config/components/e2e
78-
79-
This directory provides configuration for end-to-end testing of OLMv1.
80-
81-
# Base Configuration
82-
83-
The `config/base` directory contains the base kubebuilder-generated configuration, along with CRDs.
84-
85-
# Samples
3+
## Samples
864

875
The `config/samples` directory contains example ClusterCatalog and ClusterExtension resources.

config/base/catalogd/crd/OWNERS

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

config/base/catalogd/crd/experimental/kustomization.yaml

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

0 commit comments

Comments
 (0)