From 2c10ce0279ffddbaa633354302f79423c0c38245 Mon Sep 17 00:00:00 2001 From: Tadayoshi Sato Date: Fri, 8 Apr 2022 16:54:33 +0900 Subject: [PATCH] Release 0.5.0 --- Makefile | 2 +- README.md | 2 +- RELEASING.md | 2 +- ...hawtio-operator.clusterserviceversion.yaml | 16 +- deploy/crs/hawtio_v1alpha1_hawtio_cr.yaml | 2 +- ...operator.v0.5.0.clusterserviceversion.yaml | 271 +++++++++++++++++ .../0.5.0/hawtios.hawt.io.crd.yaml | 284 ++++++++++++++++++ .../hawtio-operator.package.yaml | 2 +- 8 files changed, 568 insertions(+), 13 deletions(-) create mode 100644 deploy/olm-catalog/hawtio-operator/0.5.0/hawtio-operator.v0.5.0.clusterserviceversion.yaml create mode 100644 deploy/olm-catalog/hawtio-operator/0.5.0/hawtios.hawt.io.crd.yaml diff --git a/Makefile b/Makefile index e9c36de680..5863f8ae39 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ DEFAULT_IMAGE := docker.io/hawtio/operator IMAGE ?= $(DEFAULT_IMAGE) DEFAULT_TAG := latest TAG ?= $(DEFAULT_TAG) -VERSION ?= 0.4.0 +VERSION ?= 0.5.0 DEBUG ?= false # Produce CRDs that work back to Kubernetes 1.11 (no version conversion) diff --git a/README.md b/README.md index 6777b709d1..a368e498c6 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ spec: resources: limits: cpu: "1" - memory: 100Mi + memory: 200Mi requests: cpu: 200m memory: 32Mi diff --git a/RELEASING.md b/RELEASING.md index a6c7fd3e19..10696348f0 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -11,7 +11,7 @@ Create a new version directory under `deploy/olm-catalog/`. ```console make build # Make sure it builds git tag x.x.x -git push origin master --tags +git push origin main --tags ``` ### 3. Build image locally and push to Docker Hub diff --git a/bundle/manifests/hawtio-operator.clusterserviceversion.yaml b/bundle/manifests/hawtio-operator.clusterserviceversion.yaml index 97ce8339cd..fb9b0a37b0 100644 --- a/bundle/manifests/hawtio-operator.clusterserviceversion.yaml +++ b/bundle/manifests/hawtio-operator.clusterserviceversion.yaml @@ -16,11 +16,11 @@ metadata: "clientCertExpirationPeriod": 24 }, "replicas": 1, - "version": "1.12.0", + "version": "1.14.0", "resources": { "limits": { "cpu": "1", - "memory": "100Mi" + "memory": "200Mi" }, "requests": { "cpu": "200m", @@ -34,14 +34,14 @@ metadata: capabilities: Seamless Upgrades categories: Integration & Delivery certified: "false" - containerImage: docker.io/hawtio/operator - createdAt: "2021-09-03T14:52:00Z" + containerImage: docker.io/hawtio/operator:0.5.0 + createdAt: "2022-04-08T00:00:00Z" description: Hawtio eases the discovery and management of Java applications deployed on OpenShift. operators.operatorframework.io/builder: operator-sdk-v1.11.0+git operators.operatorframework.io/project_layout: go.kubebuilder.io/v2 repository: https://github.com/hawtio/hawtio-operator support: Red Hat - name: hawtio-operator.v0.4.0 + name: hawtio-operator.v0.5.0 spec: apiservicedefinitions: {} customresourcedefinitions: @@ -150,7 +150,7 @@ spec: fieldPath: metadata.name - name: OPERATOR_NAME value: hawtio-operator - image: docker.io/hawtio/operator:0.4.0 + image: docker.io/hawtio/operator:0.5.0 imagePullPolicy: Always name: hawtio-operator ports: @@ -267,5 +267,5 @@ spec: minKubeVersion: 1.19.0 provider: name: Red Hat - replaces: hawtio-operator.v0.3.0 - version: 0.4.0 + replaces: hawtio-operator.v0.4.0 + version: 0.5.0 diff --git a/deploy/crs/hawtio_v1alpha1_hawtio_cr.yaml b/deploy/crs/hawtio_v1alpha1_hawtio_cr.yaml index 02e403e678..e8b34668a8 100644 --- a/deploy/crs/hawtio_v1alpha1_hawtio_cr.yaml +++ b/deploy/crs/hawtio_v1alpha1_hawtio_cr.yaml @@ -12,7 +12,7 @@ spec: resources: limits: cpu: "1" - memory: 100Mi + memory: 200Mi requests: cpu: 200m memory: 32Mi diff --git a/deploy/olm-catalog/hawtio-operator/0.5.0/hawtio-operator.v0.5.0.clusterserviceversion.yaml b/deploy/olm-catalog/hawtio-operator/0.5.0/hawtio-operator.v0.5.0.clusterserviceversion.yaml new file mode 100644 index 0000000000..fb9b0a37b0 --- /dev/null +++ b/deploy/olm-catalog/hawtio-operator/0.5.0/hawtio-operator.v0.5.0.clusterserviceversion.yaml @@ -0,0 +1,271 @@ +apiVersion: operators.coreos.com/v1alpha1 +kind: ClusterServiceVersion +metadata: + annotations: + alm-examples: |- + [ + { + "apiVersion": "hawt.io/v1alpha1", + "kind": "Hawtio", + "metadata": { + "name": "hawtio-online" + }, + "spec": { + "auth": { + "clientCertCheckSchedule": "* */12 * * *", + "clientCertExpirationPeriod": 24 + }, + "replicas": 1, + "version": "1.14.0", + "resources": { + "limits": { + "cpu": "1", + "memory": "200Mi" + }, + "requests": { + "cpu": "200m", + "memory": "32Mi" + } + }, + "type": "Namespace" + } + } + ] + capabilities: Seamless Upgrades + categories: Integration & Delivery + certified: "false" + containerImage: docker.io/hawtio/operator:0.5.0 + createdAt: "2022-04-08T00:00:00Z" + description: Hawtio eases the discovery and management of Java applications deployed on OpenShift. + operators.operatorframework.io/builder: operator-sdk-v1.11.0+git + operators.operatorframework.io/project_layout: go.kubebuilder.io/v2 + repository: https://github.com/hawtio/hawtio-operator + support: Red Hat + name: hawtio-operator.v0.5.0 +spec: + apiservicedefinitions: {} + customresourcedefinitions: + owned: + - description: A Hawtio Console + displayName: Hawtio + kind: Hawtio + name: hawtios.hawt.io + specDescriptors: + - description: The number of Hawtio pods to deploy + displayName: Replicas + path: replicas + x-descriptors: + - urn:alm:descriptor:com.tectonic.ui:fieldGroup:Deployment + - urn:alm:descriptor:com.tectonic.ui:podCount + - description: The version used for the Hawtio + displayName: Version + path: version + x-descriptors: + - urn:alm:descriptor:com.tectonic.ui:fieldGroup:Deployment + - urn:alm:descriptor:com.tectonic.ui:text + version: v1alpha1 + description: | + Hawtio + ============== + + The Hawtio console eases the discovery and management of Java applications deployed on OpenShift. + + To secure the communication between the Hawtio console and the Jolokia agents, a client certificate is automatically generated. + + Note that the client certificate CN (defaults to `hawtio-online.hawtio.svc`) must be trusted by the Jolokia agents, for which client certification authentication is enabled. See the `clientPrincipal` parameter from the [Jolokia agent configuration options](https://jolokia.org/reference/html/agents.html#agent-jvm-config). + displayName: Hawtio Operator + icon: + - base64data: PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDE2LjAuNCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPgo8IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9HcmFwaGljcy9TVkcvMS4xL0RURC9zdmcxMS5kdGQiPgo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IgogICAgIHdpZHRoPSI2MDBweCIgaGVpZ2h0PSIxOTkuNDlweCIgdmlld0JveD0iMCAwIDYwMCAxOTkuNDkiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDYwMCAxOTkuNDkiIHhtbDpzcGFjZT0icHJlc2VydmUiPgo8Zz4KCTxnPgoJCTxwYXRoIGZpbGw9IiNDMEMwQzAiIGQ9Ik0xODMuMzA0LDc1LjUwMWMtMTIuOTQ5LDAtMjAsNS4zOTgtMjcuMDE5LDEwLjQ2OVYzNi42NjloLTIyLjI5OXY5NS40N2wyMi4zODMsMjIuMzh2LTUzLjY4MwoJCQljNi41OTMtNS4wMzQsMTEuNTExLTcuMzYxLDIwLjUxNy03LjM2MWM1LjY3MywwLDkuMzc1LDMuMDQ1LDkuMzc1LDExLjQ4NXY1Ni44NjJoMjIuMzgydi01Ni41MQoJCQlDMjA4LjY0Myw4OS4xMzUsMjAzLjA2LDc1LjUwMSwxODMuMzA0LDc1LjUwMXoiLz4KICAgICAgICA8cGF0aCBmaWxsPSIjQzBDMEMwIiBkPSJNMjE1LjQyMiwxMzIuMTkyYzAtMTIuMzUsNi42NzYtMjMuMjc5LDI0Ljg3My0yMy4yNzljMCwwLDI0LjkyOSwwLjE1NiwyNC45MjksMGMwLDAsMC4xNjUtNS4yODIsMC01LjQ0MQoJCQljMC05LjA0OC00LjIyOS0xMC40NjktMTEuMzQ3LTEwLjQ2OWMtNy4zNzgsMC0yOC42NjgsMS4zMjQtMzUuNjQ4LDEuODI3VjgxLjAxN2MxMS4xNzktNC4zNDIsMjIuODUyLTUuNjA2LDM4LjY4LTUuNjc5CgkJCWMxOC4yOC0wLjA3NSwzMC43MDIsNi4yNDEsMzAuNzAyLDI3LjI1NXY1OS4yM2gtMTcuNjcybC00LjcxNC05LjM1Yy0wLjkzMSwxLjg0LTEyLjg0MywxMC41NzItMjUuODExLDEwLjMwOAoJCQljLTE2LjMzNC0wLjQzNy0yMy45OTEtMTEuNTYtMjMuOTkxLTIyLjU5OVYxMzIuMTkyeiBNMjQ1Ljc0MiwxNDQuNzk1YzkuMzYyLDAsMTkuNDgyLTYuNTY4LDE5LjQ4Mi02LjU2OFYxMjIuNjdsLTIwLjUzMiwxLjU4MgoJCQljLTUuOTEsMC41NTMtNi44ODQsNC45MjMtNi44ODQsOC42MzV2NC4xMjVDMjM3LjgwOCwxNDQuMDcsMjQxLjYyNSwxNDQuNzk1LDI0NS43NDIsMTQ0Ljc5NXoiLz4KICAgICAgICA8cGF0aCBmaWxsPSIjQzBDMEMwIiBkPSJNMzExLjk0Miw3Ni45MzdsMTcuMDA4LDU4LjY2N2wxNS4yMDctNTguNjY3aDIyLjI4bC01LjkwNywyMi44NjdsMTQuMDYyLDM1LjhsMTYuNzQ2LTU4LjY2N2gyNC4wMjkKCQkJbC0yNy40MzMsODQuODg2aC0yNS4wMjVsLTEyLjcwMy0zMC43NTJsLTkuNjAyLDMwLjc1MkgzMTUuMTVsLTI3LjE0OS04NC44ODZIMzExLjk0MnoiLz4KICAgICAgICA8cGF0aCBmaWxsPSIjQzBDMEMwIiBkPSJNNDIwLjA2Miw4MS40MTJsMTMuNzA5LTQuNjM0bDMuNzU4LTIzLjY2MmgxOC42MjV2MjMuNjYyaDE4Ljk3N3YxNy4xMDRoLTE4Ljk3N3YzNC4wNDkKCQkJYzAsMTIuNTAzLDIuODgyLDE1LjE3Myw3LjI2NywxNi44MDFjMCwwLDkuNTkyLDMuMzU3LDEwLjcwMywzLjM1N3YxMy43NDloLTE5LjUxM2MtMTIuNTY3LDAtMjAuODQtNy44NDktMjAuODQtMzAuMzg5VjkzLjg4MgoJCQloLTEzLjcwOVY4MS40MTJ6Ii8+CiAgICAgICAgPHBhdGggZmlsbD0iI0MwQzBDMCIgZD0iTTQ4NC42MjMsNTAuMTYyYzAtMi4zOTgsMS4yNzctNCwzLjgzOS00aDE2Ljc4NmMyLjM5NSwwLDMuNTg0LDEuNzY1LDMuNTg0LDR2MTQuMTcxCgkJCWMwLDIuMzk0LTEuMzQ5LDMuNjc4LTMuNTg0LDMuNjc4aC0xNi43ODZjLTIuMjM5LDAtMy44MzktMS40MzYtMy44MzktMy42NzhWNTAuMTYyeiBNNDg1LjQzMSw3Ni45MzdoMjIuMzc2djg0Ljg4NmgtMjIuMzc2CgkJCVY3Ni45Mzd6Ii8+CiAgICAgICAgPHBhdGggZmlsbD0iI0MwQzBDMCIgZD0iTTU1OS42MzcsNzYuMTQyYzI5LjIzMywwLDM4LjcyOSwxMC43MDgsMzguNzI5LDQ0LjQzNWMwLDMxLjQ5Ni05LjA1NSw0Mi4wNDQtMzguNzI5LDQyLjA0NAoJCQljLTI5LjMxMywwLTM4LjcyNi0xMS42Ny0zOC43MjYtNDIuMDQ0QzUyMC45MTEsODUuODkzLDUzMC45NDgsNzYuMTQyLDU1OS42MzcsNzYuMTQyeiBNNTU5LjYzNywxNDQuNjM5CgkJCWMxMi42MTEsMCwxNi4zNS0xLjcxMSwxNi4zNS0yNC4wNjJjMC0yMy43NzItMy4wMS0yNi40NTMtMTYuMzUtMjYuNDUzYy0xMy4yNDMsMC0xNi4zNDIsMi42OTMtMTYuMzQyLDI2LjQ1MwoJCQlDNTQzLjI5NSwxNDIuNTQ0LDU0Ny43NDQsMTQ0LjYzOSw1NTkuNjM3LDE0NC42Mzl6Ii8+Cgk8L2c+CiAgICA8cGF0aCBmaWxsPSIjQzBDMEMwIiBkPSJNMjAuNTc1LDEzMi41MTRjMTEuNzM2LDExLjc0MSwyNy4zNSwxOC4yMTQsNDMuOTUzLDE4LjIxNGMxMS40MDksMCwyMi42MjUtMy4xODcsMzIuNDQxLTkuMjExbDIuMDc3LTEuMjcKCQlsMjEuOTIsMjEuOTI5aDM0LjMzOGwtMzkuMDk5LTM5LjFsMS4yNzQtMi4wNjdjMTUuMDkxLTI0LjU5MywxMS4zOS01Ni4wMDctOC45OTctNzYuMzkzCgkJQzk2Ljc0MiwzMi44NzYsODEuMTI5LDI2LjQwOSw2NC41MjgsMjYuNDA5Yy0xNi42MDQsMC0zMi4yMDYsNi40NjgtNDMuOTQ3LDE4LjIwN0M4LjgzOCw1Ni4zNTgsMi4zNjUsNzEuOTcsMi4zNjUsODguNTY5CgkJQzIuMzY1LDEwNS4xNjcsOC44MzIsMTIwLjc3NSwyMC41NzUsMTMyLjUxNHogTTM3Ljc0NSw2MS43ODVjNy4xNDgtNy4xNTYsMTYuNjYzLTExLjA5NSwyNi43ODMtMTEuMDk1CgkJYzEwLjExNywwLDE5LjYyOSwzLjkzOSwyNi43OCwxMS4wOTVjNy4xNTUsNy4xNTgsMTEuMDk1LDE2LjY2OCwxMS4wOTUsMjYuNzg1YzAsMTAuMTIxLTMuOTQsMTkuNjMtMTEuMDk4LDI2Ljc4MwoJCWMtNy4xNDYsNy4xNTMtMTYuNjYsMTEuMDkyLTI2Ljc3NywxMS4wOTJjLTEwLjEyLDAtMTkuNjM0LTMuOTM4LTI2Ljc4Ni0xMS4wOTJjLTcuMTU0LTcuMTYxLTExLjA5NS0xNi42NjctMTEuMDk1LTI2Ljc4MwoJCUMyNi42NDcsNzguNDUzLDMwLjU4OCw2OC45NDIsMzcuNzQ1LDYxLjc4NXoiLz4KICAgIDxnPgoJCTxwYXRoIGZpbGw9IiNFQzc5MjkiIGQ9Ik04MC4xOTcsOTIuOTI2djAuMDkzYzAuNDY5LDAuODU0LDAuNzMzLDEuODI0LDAuNzQ2LDIuODYyYzAsMy4yNjktMi42NTUsNS45MjItNS45MjUsNS45MjIKCQkJYy0zLjI3LDAtNS45MTgtMi42NTMtNS45MTgtNS45MjJjMC0xLjQ0MiwwLjUxNS0yLjc2NywxLjM3OC0zLjc5NmMwLDAsMTQuNDY0LTIwLjEzNy01Ljc4NS0zMy40OThjMCwwLDUuODc1LDE1Ljg2LTguMTI5LDIyLjUyNwoJCQljMCwwLTMuODY2LDIuNzI5LDAuNC02LjMzNWMwLDAtMTEuODksNi42ODMtMTEuODksMjIuODE0YzAsNy4yOTEsMy43NzYsMTMuNjkxLDkuNDc0LDE3LjM3NgoJCQljLTAuMTc3LTAuNjU4LTAuMjg5LTEuNDExLTAuMjg5LTIuMjk5YzAuMDA2LTYuNDY5LDUuODA0LTE0LjAzMSw3LjU4Ni0xNC4wMTljMCwwLDAuNDUsNy42NjQsMi41MDYsMTEuMjc3CgkJCWMxLjYyLDMuMDU4LDAuNjM2LDYuNDQ0LTEuNTEzLDguMTM4YzAuOTYyLDAuMTM5LDEuOTQ0LDAuMjM0LDIuOTQ3LDAuMjM0YzUuNDY4LDAsMTAuNDQ2LTIuMTIyLDE0LjE0Ny01LjU5MQoJCQljMCwwLTAuMDA2LTAuMDE4LTAuMDA2LTAuMDIzQzg2LjgzMywxMDMuNjA1LDgyLjgyOCw5Ni4yMjQsODAuMTk3LDkyLjkyNnoiLz4KCTwvZz4KPC9nPgo8L3N2Zz4= + mediatype: image/svg+xml + install: + spec: + clusterPermissions: + - rules: + - apiGroups: + - oauth.openshift.io + resources: + - oauthclients + verbs: + - '*' + - apiGroups: + - config.openshift.io + resources: + - clusterversions + verbs: + - get + - apiGroups: + - apiextensions.k8s.io + resources: + - customresourcedefinitions + verbs: + - get + - list + - watch + - apiGroups: + - console.openshift.io + resources: + - consolelinks + - consoleyamlsamples + verbs: + - create + - delete + - get + - list + - patch + - update + - watch + - apiGroups: + - "" + resourceNames: + - signing-key + resources: + - secrets + verbs: + - get + serviceAccountName: hawtio-operator + deployments: + - name: hawtio-operator + spec: + replicas: 1 + selector: + matchLabels: + name: hawtio-operator + strategy: {} + template: + metadata: + labels: + name: hawtio-operator + spec: + containers: + - command: + - hawtio-operator + env: + - name: WATCH_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.annotations['olm.targetNamespaces'] + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: OPERATOR_NAME + value: hawtio-operator + image: docker.io/hawtio/operator:0.5.0 + imagePullPolicy: Always + name: hawtio-operator + ports: + - containerPort: 8080 + name: metrics + resources: {} + serviceAccountName: hawtio-operator + permissions: + - rules: + - apiGroups: + - "" + resources: + - pods + verbs: + - get + - list + - watch + - apiGroups: + - "" + resources: + - secrets + verbs: + - get + - watch + - create + - delete + - list + - apiGroups: + - "" + resources: + - configmaps + - serviceaccounts + - services + verbs: + - create + - delete + - deletecollection + - get + - list + - patch + - update + - watch + - apiGroups: + - apps + resources: + - deployments + verbs: + - create + - delete + - deletecollection + - get + - list + - patch + - update + - watch + - apiGroups: + - route.openshift.io + resources: + - routes + verbs: + - '*' + - apiGroups: + - route.openshift.io + resources: + - routes/custom-host + verbs: + - create + - apiGroups: + - template.openshift.io + resources: + - processedtemplates + verbs: + - '*' + - apiGroups: + - hawt.io + resources: + - '*' + verbs: + - '*' + - apiGroups: + - batch + resources: + - cronjobs + verbs: + - get + - watch + - list + - update + - create + - delete + serviceAccountName: hawtio-operator + strategy: deployment + installModes: + - supported: true + type: OwnNamespace + - supported: true + type: SingleNamespace + - supported: false + type: MultiNamespace + - supported: false + type: AllNamespaces + keywords: + - Hawtio + - Java + - Management + - Console + links: + - name: Hawtio Web site + url: https://hawt.io + maintainers: + - email: hawtio@googlegroups.com + name: The Hawtio team + maturity: alpha + minKubeVersion: 1.19.0 + provider: + name: Red Hat + replaces: hawtio-operator.v0.4.0 + version: 0.5.0 diff --git a/deploy/olm-catalog/hawtio-operator/0.5.0/hawtios.hawt.io.crd.yaml b/deploy/olm-catalog/hawtio-operator/0.5.0/hawtios.hawt.io.crd.yaml new file mode 100644 index 0000000000..fe27ad7bb4 --- /dev/null +++ b/deploy/olm-catalog/hawtio-operator/0.5.0/hawtios.hawt.io.crd.yaml @@ -0,0 +1,284 @@ +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + name: hawtios.hawt.io +spec: + group: hawt.io + names: + categories: + - hawtio + kind: Hawtio + listKind: HawtioList + plural: hawtios + singular: hawtio + preserveUnknownFields: false + scope: Namespaced + versions: + - additionalPrinterColumns: + - description: Creation phase + jsonPath: .metadata.creationTimestamp + name: Age + type: date + - description: Console image + jsonPath: .status.image + name: Image + type: string + - description: Console phase + jsonPath: .status.phase + name: Phase + type: string + - description: Console URL + jsonPath: .status.URL + name: URL + type: string + name: v1alpha1 + schema: + openAPIV3Schema: + description: Hawtio Console + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation + of an object. Servers should convert recognized schemas to the latest + internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this + object represents. Servers may infer this from the endpoint the client + submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: + description: Defines the desired state of Hawtio + properties: + auth: + description: The authentication configuration + properties: + clientCertCheckSchedule: + description: CronJob schedule that defines how often the expiry + of the certificate will be checked + type: string + clientCertCommonName: + description: The generated client certificate CN + type: string + clientCertExpirationDate: + description: The generated client certificate expiration date + format: date-time + type: string + clientCertExpirationPeriod: + description: The duration in hours before the expiration date, + during which the certification can be rotated. The default is + set to 24 hours. + type: integer + type: object + config: + description: The Hawtio console configuration + properties: + about: + description: The information to be displayed in the About page + properties: + additionalInfo: + description: The text for the description section + type: string + copyright: + description: The text for the copyright section + type: string + imgSrc: + description: The image displayed in the page. It can be a + path, relative to the Hawtio status URL, or an absolute + URL. + type: string + productInfo: + description: List of product information + items: + description: The product information displayed in the About + page + properties: + name: + description: The name of the product information + type: string + value: + description: The value of the product information + type: string + required: + - name + - value + type: object + type: array + title: + description: The title of the page + type: string + type: object + branding: + description: The UI branding + properties: + appLogoUrl: + description: The URL of the logo, that displays in the navigation + bar. It can be a path, relative to the Hawtio status URL, + or an absolute URL. + type: string + appName: + description: The application title, that usually displays + in the Web browser tab. + type: string + css: + description: The URL of an external CSS stylesheet, that can + be used to style the application. It can be a path, relative + to the Hawtio status URL, or an absolute URL. + type: string + favicon: + description: The URL of the favicon, that usually displays + in the Web browser tab. It can be a path, relative to the + Hawtio status URL, or an absolute URL. + type: string + type: object + disabledRoutes: + description: Disables UI components with matching routes + items: + type: string + type: array + online: + description: The OpenShift related configuration + properties: + consoleLink: + description: The configuration for the OpenShift Web console + link. A link is added to the application menu when the Hawtio + deployment is equal to 'cluster'. Otherwise, a link is added + to the Hawtio project dashboard. + properties: + imageRelativePath: + description: The path, relative to the Hawtio status URL, + for the icon used in front of the link in the application + menu. It is only applicable when the Hawtio deployment + type is equal to 'cluster'. The image should be square + and will be shown at 24x24 pixels. + type: string + section: + description: The section of the application menu in which + the link should appear. It is only applicable when the + Hawtio deployment type is equal to 'cluster'. + type: string + text: + description: The text display for the link + type: string + type: object + projectSelector: + description: The selector used to watch for projects. It is + only applicable when the Hawtio deployment type is equal + to 'cluster'. By default, all the projects the logged in + user has access to are watched. The string representation + of the selector must be provided, as mandated by the `--selector`, + or `-l`, options from the `kubectl get` command. See https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ + type: string + type: object + type: object + nginx: + description: The Nginx runtime configuration + properties: + clientBodyBufferSize: + description: The buffer size for reading client request body. + Defaults to `256k`. + type: string + proxyBuffers: + description: The number and size of the buffers used for reading + a response from the proxied server, for a single connection. + Defaults to `16 128k`. + type: string + subrequestOutputBufferSize: + description: The size of the buffer used for storing the response + body of a subrequest. Defaults to `10m`. + type: string + type: object + rbac: + description: The RBAC configuration + properties: + configMap: + description: The name of the ConfigMap that contains the ACL definition. + type: string + type: object + replicas: + description: Number of desired pods. This is a pointer to distinguish + between explicit zero and not specified. Defaults to 1. + format: int32 + type: integer + resources: + description: The Hawtio console compute resources + properties: + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + description: 'Limits describes the maximum amount of compute resources + allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + description: 'Requests describes the minimum amount of compute + resources required. If Requests is omitted for a container, + it defaults to Limits if that is explicitly specified, otherwise + to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' + type: object + type: object + routeHostName: + description: 'The edge host name of the route that exposes the Hawtio + service externally. If not specified, it is automatically generated + and is of the form: [-]. where + is the default routing sub-domain as configured for the cluster. + Note that the operator will recreate the route if the field is emptied, + so that the host is re-generated.' + type: string + type: + description: 'The deployment type. Defaults to cluster. cluster: Hawtio + is capable of discovering and managing applications across all namespaces + the authenticated user has access to. namespace: Hawtio is capable + of discovering and managing applications within the deployment namespace.' + enum: + - Cluster + - Namespace + type: string + version: + description: The Hawtio console container image version. Defaults + to 'latest'. + type: string + type: object + status: + description: Reports the observed state of Hawtio + properties: + URL: + description: The Hawtio console route URL + type: string + image: + description: The Hawtio console container image + type: string + phase: + description: The Hawtio deployment phase + enum: + - Initialized + - Deployed + - Failed + type: string + replicas: + description: The actual number of pods + format: int32 + type: integer + selector: + description: The label selector for the Hawtio pods + type: string + type: object + type: object + served: true + storage: true + subresources: + scale: + labelSelectorPath: .status.selector + specReplicasPath: .spec.replicas + statusReplicasPath: .status.replicas + status: {} diff --git a/deploy/olm-catalog/hawtio-operator/hawtio-operator.package.yaml b/deploy/olm-catalog/hawtio-operator/hawtio-operator.package.yaml index fb2cde78d6..e0b6c7ca39 100644 --- a/deploy/olm-catalog/hawtio-operator/hawtio-operator.package.yaml +++ b/deploy/olm-catalog/hawtio-operator/hawtio-operator.package.yaml @@ -1,5 +1,5 @@ channels: -- currentCSV: hawtio-operator.v0.4.0 +- currentCSV: hawtio-operator.v0.5.0 name: alpha defaultChannel: alpha packageName: hawtio-operator