From 09b06d3d9fa075abd8bfe58c5426ae696982e2f6 Mon Sep 17 00:00:00 2001 From: Tom George Date: Mon, 18 Jan 2021 17:05:00 -0600 Subject: [PATCH] Add note clarifying that the kubernetes image puller operator is community-supported (#627) Signed-off-by: Tom George --- deploy/crds/org_v1_che_crd.yaml | 14 +++++++++----- .../manifests/org_v1_che_crd.yaml | 14 +++++++++----- .../manifests/org_v1_che_crd.yaml | 14 +++++++++----- pkg/apis/org/v1/che_types.go | 5 ++++- 4 files changed, 31 insertions(+), 16 deletions(-) diff --git a/deploy/crds/org_v1_che_crd.yaml b/deploy/crds/org_v1_che_crd.yaml index 02554088a..d50ff307a 100644 --- a/deploy/crds/org_v1_che_crd.yaml +++ b/deploy/crds/org_v1_che_crd.yaml @@ -238,11 +238,15 @@ spec: description: Kubernetes Image Puller configuration properties: enable: - description: Install and configure the Kubernetes Image Puller Operator. - If true and no spec is provided, it will create a default KubernetesImagePuller - object to be managed by the Operator. If false, the KubernetesImagePuller - object will be deleted, and the operator will be uninstalled, - regardless of whether or not a spec is provided. + description: "Install and configure the Community Supported Kubernetes + Image Puller Operator. If true and no spec is provided, it will + create a default KubernetesImagePuller object to be managed by + the Operator. If false, the KubernetesImagePuller object will + be deleted, and the operator will be uninstalled, regardless of + whether or not a spec is provided. \n Please note that while this + operator and its behavior is community-supported, its payload + may be commercially-supported if you use it for pulling commercially-supported + images." type: boolean spec: description: A KubernetesImagePullerSpec to configure the image diff --git a/deploy/olm-catalog/eclipse-che-preview-kubernetes/manifests/org_v1_che_crd.yaml b/deploy/olm-catalog/eclipse-che-preview-kubernetes/manifests/org_v1_che_crd.yaml index 02554088a..d50ff307a 100644 --- a/deploy/olm-catalog/eclipse-che-preview-kubernetes/manifests/org_v1_che_crd.yaml +++ b/deploy/olm-catalog/eclipse-che-preview-kubernetes/manifests/org_v1_che_crd.yaml @@ -238,11 +238,15 @@ spec: description: Kubernetes Image Puller configuration properties: enable: - description: Install and configure the Kubernetes Image Puller Operator. - If true and no spec is provided, it will create a default KubernetesImagePuller - object to be managed by the Operator. If false, the KubernetesImagePuller - object will be deleted, and the operator will be uninstalled, - regardless of whether or not a spec is provided. + description: "Install and configure the Community Supported Kubernetes + Image Puller Operator. If true and no spec is provided, it will + create a default KubernetesImagePuller object to be managed by + the Operator. If false, the KubernetesImagePuller object will + be deleted, and the operator will be uninstalled, regardless of + whether or not a spec is provided. \n Please note that while this + operator and its behavior is community-supported, its payload + may be commercially-supported if you use it for pulling commercially-supported + images." type: boolean spec: description: A KubernetesImagePullerSpec to configure the image diff --git a/deploy/olm-catalog/eclipse-che-preview-openshift/manifests/org_v1_che_crd.yaml b/deploy/olm-catalog/eclipse-che-preview-openshift/manifests/org_v1_che_crd.yaml index e4b3cf7aa..bc4c6efe8 100644 --- a/deploy/olm-catalog/eclipse-che-preview-openshift/manifests/org_v1_che_crd.yaml +++ b/deploy/olm-catalog/eclipse-che-preview-openshift/manifests/org_v1_che_crd.yaml @@ -239,11 +239,15 @@ spec: description: Kubernetes Image Puller configuration properties: enable: - description: Install and configure the Kubernetes Image Puller Operator. - If true and no spec is provided, it will create a default KubernetesImagePuller - object to be managed by the Operator. If false, the KubernetesImagePuller - object will be deleted, and the operator will be uninstalled, - regardless of whether or not a spec is provided. + description: "Install and configure the Community Supported Kubernetes\ + \ Image Puller Operator. If true and no spec is provided, it will\ + \ create a default KubernetesImagePuller object to be managed\ + \ by the Operator. If false, the KubernetesImagePuller object\ + \ will be deleted, and the operator will be uninstalled, regardless\ + \ of whether or not a spec is provided. \n Please note that while\ + \ this operator and its behavior is community-supported, its payload\ + \ may be commercially-supported if you use it for pulling commercially-supported\ + \ images." type: boolean spec: description: A KubernetesImagePullerSpec to configure the image diff --git a/pkg/apis/org/v1/che_types.go b/pkg/apis/org/v1/che_types.go index e1e8e6d2a..45221df8f 100644 --- a/pkg/apis/org/v1/che_types.go +++ b/pkg/apis/org/v1/che_types.go @@ -532,10 +532,13 @@ type CheClusterSpecMetrics struct { // Configuration settings for installation and configuration of the Kubernetes Image Puller // See https://github.com/che-incubator/kubernetes-image-puller-operator type CheClusterSpecImagePuller struct { - // Install and configure the Kubernetes Image Puller Operator. If true and no spec is provided, + // Install and configure the Community Supported Kubernetes Image Puller Operator. If true and no spec is provided, // it will create a default KubernetesImagePuller object to be managed by the Operator. // If false, the KubernetesImagePuller object will be deleted, and the operator will be uninstalled, // regardless of whether or not a spec is provided. + // + // Please note that while this operator and its behavior is community-supported, its payload may be commercially-supported + // if you use it for pulling commercially-supported images. Enable bool `json:"enable"` // A KubernetesImagePullerSpec to configure the image puller in the CheCluster // +optional