-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Reorganize config to support reusable components
Update to catalogd v0.17.0 to share a common certificate issuer Signed-off-by: Todd Short <tshort@redhat.com>
- Loading branch information
Showing
20 changed files
with
111 additions
and
106 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
# OPERATOR-CONTROLLER CONFIG | ||
|
||
## config/base | ||
|
||
This provides an insecure (i.e. no TLS) basic configuration of operator-controller. | ||
|
||
This configuration specifies a namespace of `olmv1-system`. | ||
|
||
## config/overlays/cert-manager | ||
|
||
This includes support for a secure (i.e. with TLS) configuration of operator-controller. This configuration uses: | ||
* config/base | ||
* config/components/tls | ||
* config/components/ca | ||
|
||
This configuration requires cert-manager. | ||
|
||
## config/overlays/e2e | ||
|
||
This provides additional configuration support for end-to-end testing, including code coverage. This configuration uses: | ||
* config/base | ||
* config/components/tls | ||
* config/components/ca | ||
* config/components/coverage | ||
|
||
This configuration requires cert-manager. | ||
|
||
## Components | ||
|
||
Each of the `kustomization.yaml` files specify a `Component`, rather than an overlay. | ||
|
||
### config/components/tls | ||
|
||
This provides a basic configuration of operator-controller with TLS support for catalogd. | ||
|
||
This component specifies the `olmv1-system` namespace. | ||
|
||
This component requires cert-manager. | ||
|
||
### config/components/coverage | ||
|
||
Provides configuration for code coverage. | ||
|
||
This component specifies the `olmv1-system` namespace. | ||
|
||
### config/components/ca | ||
|
||
Procides a CA for operator-controller operation. | ||
|
||
This component _does not_ specify a namespace, and must be included last. | ||
|
||
This component requires cert-manager. |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
apiVersion: kustomize.config.k8s.io/v1alpha1 | ||
kind: Component | ||
# No namespace is specified here, otherwise, it will overwrite _all_ the other namespaces! | ||
resources: | ||
- issuers.yaml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
apiVersion: kustomize.config.k8s.io/v1alpha1 | ||
kind: Component | ||
namespace: olmv1-system | ||
resources: | ||
- manager_e2e_coverage_pvc.yaml | ||
- manager_e2e_coverage_copy_pod.yaml | ||
patches: | ||
- path: manager_e2e_coverage_patch.yaml |
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
apiVersion: kustomize.config.k8s.io/v1alpha1 | ||
kind: Component | ||
namespace: olmv1-system | ||
resources: | ||
- resources/manager_cert.yaml | ||
patches: | ||
- target: | ||
kind: Deployment | ||
name: controller-manager | ||
path: patches/manager_deployment_cert.yaml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
- op: add | ||
path: /spec/template/spec/volumes/- | ||
value: {"name":"olmv1-certificate", "secret":{"secretName":"olmv1-cert", "optional": false, "items": [{"key": "ca.crt", "path": "olm-ca.crt"}]}} | ||
- op: add | ||
path: /spec/template/spec/containers/0/volumeMounts/- | ||
value: {"name":"olmv1-certificate", "readOnly": true, "mountPath":"/var/certs/olm-ca.crt", "subPath":"olm-ca.crt"} | ||
- op: add | ||
path: /spec/template/spec/containers/0/args/- | ||
value: "--ca-certs-dir=/var/certs" |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
# kustomization file for secure operator-controller | ||
# DO NOT ADD A NAMESPACE HERE | ||
apiVersion: kustomize.config.k8s.io/v1beta1 | ||
kind: Kustomization | ||
resources: | ||
- ../../base | ||
components: | ||
- ../../components/tls | ||
# ca must be last or tls will overwrite the namespaces | ||
- ../../components/ca |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,11 @@ | ||
namespace: olmv1-system | ||
|
||
# kustomization file for all the e2e's | ||
# DO NOT ADD A NAMESPACE HERE | ||
apiVersion: kustomize.config.k8s.io/v1beta1 | ||
kind: Kustomization | ||
resources: | ||
- ../../overlays/tls | ||
- manager_e2e_coverage_pvc.yaml | ||
- manager_e2e_coverage_copy_pod.yaml | ||
|
||
patches: | ||
- path: manager_e2e_coverage_patch.yaml | ||
- ../../base | ||
components: | ||
- ../../components/tls | ||
- ../../components/coverage | ||
# ca must be last or (tls|coverage) will overwrite the namespaces | ||
- ../../components/ca |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters