Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport image puller docstring change to 7.24.x #632

Merged
merged 1 commit into from
Jan 18, 2021
Merged

Backport image puller docstring change to 7.24.x #632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions deploy/crds/org_v1_che_crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 9 additions & 5 deletions deploy/olm-catalog/eclipse-che-preview-kubernetes/manifests/org_v1_che_crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 9 additions & 5 deletions deploy/olm-catalog/eclipse-che-preview-openshift/manifests/org_v1_che_crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion pkg/apis/org/v1/che_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down