internet/awx-operator
3
0
Fork 0
mirror of https://github.com/ansible/awx-operator.git synced 2026-03-26 21:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reset for some changes, updated crd and regenerated files

Browse Source
This commit is contained in:
tabjer
2021-07-15 08:44:30 +08:00
parent cc6cb4b990
commit e36b1a3b2c
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ansible/templates/crd.yml.j2
View File

@@ -86,6 +86,9 @@ spec:
- ingress - ingress
- Route - Route
- route - route
ingress_path:
description: The ingress path used to reach the deployed service
type: string
ingress_annotations: ingress_annotations:
description: Annotations to add to the Ingress Controller description: Annotations to add to the Ingress Controller
type: string type: string

2
bundle.Dockerfile
View File

@@ -6,9 +6,9 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
LABEL operators.operatorframework.io.bundle.package.v1=awx-operator LABEL operators.operatorframework.io.bundle.package.v1=awx-operator
LABEL operators.operatorframework.io.bundle.channels.v1=alpha LABEL operators.operatorframework.io.bundle.channels.v1=alpha
LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha
LABEL operators.operatorframework.io.metrics.project_layout=ansible
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v0.19.4 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v0.19.4
LABEL operators.operatorframework.io.metrics.project_layout=ansible
COPY deploy/olm-catalog/awx-operator/manifests /manifests/ COPY deploy/olm-catalog/awx-operator/manifests /manifests/
COPY deploy/olm-catalog/awx-operator/metadata /metadata/ COPY deploy/olm-catalog/awx-operator/metadata /metadata/

9
deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxs_crd.yaml
View File

@@ -36,7 +36,8 @@ spec:
description: Secret where the broadcast websocket secret can be found description: Secret where the broadcast websocket secret can be found
type: string type: string
bundle_cacert_secret: bundle_cacert_secret:
description: Secret where can be found the trusted Certificate Authority Bundle description: Secret where can be found the trusted Certificate Authority
Bundle
type: string type: string
ca_trust_bundle: ca_trust_bundle:
description: Path where the trusted CA bundle is available description: Path where the trusted CA bundle is available
@@ -140,6 +141,9 @@ spec:
ingress_annotations: ingress_annotations:
description: Annotations to add to the Ingress Controller description: Annotations to add to the Ingress Controller
type: string type: string
ingress_path:
description: The ingress path used to reach the deployed service
type: string
ingress_tls_secret: ingress_tls_secret:
description: Secret where the Ingress TLS secret can be found description: Secret where the Ingress TLS secret can be found
type: string type: string
@@ -152,9 +156,6 @@ spec:
- Route - Route
- route - route
type: string type: string
ingress_path:
description: The ingress path used to reach the deployed service
type: string
init_container_image: init_container_image:
description: Registry path to the init container to use description: Registry path to the init container to use
type: string type: string