THIS IS ONLY A TEST INSTANCE. DON'T DO IMPORTANT WORK HERE!

Unverified Commit 15b75be2 authored by David Festal's avatar David Festal Committed by GitHub
Browse files

Fix crd inconsistencies (#145)



* Fix inconsistencies between Go API and CRD
* Update nightly OLM files vs last CRDs
Signed-off-by: default avatarDavid Festal <dfestal@redhat.com>
parent 2e47c333
......@@ -331,6 +331,11 @@ spec:
`true`, then no such dedicated server will be started by the operator
and you will have to manually set the `pluginRegistryUrl` field.
type: boolean
gitSelfSignedCert:
description: If enabled, then the certificate from `che-git-self-signed-cert`
config map will be propagated to the Che components and provide
particular configuration for Git.
type: boolean
nonProxyHosts:
description: List of hosts that should not use the configured proxy.
Use `|`` as delimiter, eg `localhost|my.host.com|123.42.12.32`
......@@ -362,8 +367,8 @@ spec:
default this will be automatically calculated by the operator.
type: string
proxyPassword:
description: "Password of the proxy server \n Only use when proxy
configuration is required (see also the `proxyUser` field)."
description: Password of the proxy server Only use when proxy configuration
is required (see also the `proxyUser` field).
type: string
proxyPort:
description: Port of the proxy server. Only use when configuring
......@@ -388,11 +393,6 @@ spec:
clusters that have not been setup with a valid certificate for
the routes. This is disabled by default.
type: boolean
gitSelfSignedCert:
description: If enabled, then the certificate from `che-git-self-signed-cert`
config map will be propagated to the Che components and provide particular
configuration for Git.
type: boolean
serverMemoryLimit:
description: Overrides the memory limit used in the Che server deployment.
Defaults to 1Gi.
......
--- /home/dfestal/go/src/github.com/eclipse/che-operator/olm/eclipse-che-preview-kubernetes/deploy/olm-catalog/eclipse-che-preview-kubernetes/9.9.9-nightly.1575355471/eclipse-che-preview-kubernetes.crd.yaml 2020-01-10 16:33:48.000000000 +0100
+++ /home/dfestal/go/src/github.com/eclipse/che-operator/olm/eclipse-che-preview-kubernetes/deploy/olm-catalog/eclipse-che-preview-kubernetes/9.9.9-nightly.1578737756/eclipse-che-preview-kubernetes.crd.yaml 2020-01-11 11:15:56.000000000 +0100
@@ -24,8 +24,6 @@
status: {}
validation:
openAPIV3Schema:
- description: The `CheCluster` custom resource allows defining and managing a
- Che server installation
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
@@ -333,6 +331,11 @@
`true`, then no such dedicated server will be started by the operator
and you will have to manually set the `pluginRegistryUrl` field.
type: boolean
+ gitSelfSignedCert:
+ description: If enabled, then the certificate from `che-git-self-signed-cert`
+ config map will be propagated to the Che components and provide
+ particular configuration for Git.
+ type: boolean
nonProxyHosts:
description: List of hosts that should not use the configured proxy.
Use `|`` as delimiter, eg `localhost|my.host.com|123.42.12.32`
@@ -364,8 +367,8 @@
default this will be automatically calculated by the operator.
type: string
proxyPassword:
- description: "Password of the proxy server \n Only use when proxy
- configuration is required (see also the `proxyUser` field)."
+ description: Password of the proxy server Only use when proxy configuration
+ is required (see also the `proxyUser` field).
type: string
proxyPort:
description: Port of the proxy server. Only use when configuring
@@ -499,7 +502,6 @@
the pod is in this state.
type: string
type: object
- type: object
version: v1
versions:
- name: v1
--- /home/dfestal/go/src/github.com/eclipse/che-operator/olm/eclipse-che-preview-kubernetes/deploy/olm-catalog/eclipse-che-preview-kubernetes/9.9.9-nightly.1575355471/eclipse-che-preview-kubernetes.v9.9.9-nightly.1575355471.clusterserviceversion.yaml 2020-01-10 16:33:48.000000000 +0100
+++ /home/dfestal/go/src/github.com/eclipse/che-operator/olm/eclipse-che-preview-kubernetes/deploy/olm-catalog/eclipse-che-preview-kubernetes/9.9.9-nightly.1578737756/eclipse-che-preview-kubernetes.v9.9.9-nightly.1578737756.clusterserviceversion.yaml 2020-01-11 11:15:56.000000000 +0100
@@ -49,12 +49,12 @@
categories: Developer Tools
certified: "false"
containerImage: quay.io/eclipse/che-operator:nightly
- createdAt: "2019-12-03T06:44:31Z"
+ createdAt: "2020-01-11T10:15:56Z"
description: A Kube-native development solution that delivers portable and collaborative
developer workspaces.
repository: https://github.com/eclipse/che-operator
support: Eclipse Foundation
- name: eclipse-che-preview-kubernetes.v9.9.9-nightly.1575355471
+ name: eclipse-che-preview-kubernetes.v9.9.9-nightly.1578737756
namespace: placeholder
spec:
apiservicedefinitions: {}
@@ -350,5 +350,5 @@
maturity: stable
provider:
name: Eclipse Foundation
- replaces: eclipse-che-preview-kubernetes.v9.9.9-nightly.1572295030
- version: 9.9.9-nightly.1575355471
+ replaces: eclipse-che-preview-kubernetes.v9.9.9-nightly.1575355471
+ version: 9.9.9-nightly.1578737756
channels:
- currentCSV: eclipse-che-preview-kubernetes.v9.9.9-nightly.1575355471
- currentCSV: eclipse-che-preview-kubernetes.v9.9.9-nightly.1578737756
name: nightly
- currentCSV: eclipse-che-preview-kubernetes.v7.6.0
name: stable
......
--- /home/dfestal/go/src/github.com/eclipse/che-operator/olm/eclipse-che-preview-openshift/deploy/olm-catalog/eclipse-che-preview-openshift/9.9.9-nightly.1575355471/eclipse-che-preview-openshift.crd.yaml 2020-01-10 16:33:48.000000000 +0100
+++ /home/dfestal/go/src/github.com/eclipse/che-operator/olm/eclipse-che-preview-openshift/deploy/olm-catalog/eclipse-che-preview-openshift/9.9.9-nightly.1578737756/eclipse-che-preview-openshift.crd.yaml 2020-01-11 11:15:56.000000000 +0100
@@ -331,6 +331,11 @@
`true`, then no such dedicated server will be started by the operator
and you will have to manually set the `pluginRegistryUrl` field.
type: boolean
+ gitSelfSignedCert:
+ description: If enabled, then the certificate from `che-git-self-signed-cert`
+ config map will be propagated to the Che components and provide
+ particular configuration for Git.
+ type: boolean
nonProxyHosts:
description: List of hosts that should not use the configured proxy.
Use `|`` as delimiter, eg `localhost|my.host.com|123.42.12.32`
@@ -362,8 +367,8 @@
default this will be automatically calculated by the operator.
type: string
proxyPassword:
- description: "Password of the proxy server \n Only use when proxy
- configuration is required (see also the `proxyUser` field)."
+ description: Password of the proxy server Only use when proxy configuration
+ is required (see also the `proxyUser` field).
type: string
proxyPort:
description: Port of the proxy server. Only use when configuring
--- /home/dfestal/go/src/github.com/eclipse/che-operator/olm/eclipse-che-preview-openshift/deploy/olm-catalog/eclipse-che-preview-openshift/9.9.9-nightly.1575355471/eclipse-che-preview-openshift.v9.9.9-nightly.1575355471.clusterserviceversion.yaml 2020-01-10 16:33:48.000000000 +0100
+++ /home/dfestal/go/src/github.com/eclipse/che-operator/olm/eclipse-che-preview-openshift/deploy/olm-catalog/eclipse-che-preview-openshift/9.9.9-nightly.1578737756/eclipse-che-preview-openshift.v9.9.9-nightly.1578737756.clusterserviceversion.yaml 2020-01-11 11:15:56.000000000 +0100
@@ -46,12 +46,12 @@
categories: Developer Tools, OpenShift Optional
certified: "false"
containerImage: quay.io/eclipse/che-operator:nightly
- createdAt: "2019-12-03T06:44:31Z"
+ createdAt: "2020-01-11T10:15:56Z"
description: A Kube-native development solution that delivers portable and collaborative
developer workspaces in OpenShift.
repository: https://github.com/eclipse/che-operator
support: Eclipse Foundation
- name: eclipse-che-preview-openshift.v9.9.9-nightly.1575355471
+ name: eclipse-che-preview-openshift.v9.9.9-nightly.1578737756
namespace: placeholder
spec:
apiservicedefinitions: {}
@@ -395,5 +395,5 @@
maturity: stable
provider:
name: Eclipse Foundation
- replaces: eclipse-che-preview-openshift.v9.9.9-nightly.1572295030
- version: 9.9.9-nightly.1575355471
+ replaces: eclipse-che-preview-openshift.v9.9.9-nightly.1575355471
+ version: 9.9.9-nightly.1578737756
channels:
- currentCSV: eclipse-che-preview-openshift.v9.9.9-nightly.1575355471
- currentCSV: eclipse-che-preview-openshift.v9.9.9-nightly.1578737756
name: nightly
- currentCSV: eclipse-che-preview-openshift.v7.6.0
name: stable
......
......@@ -117,6 +117,10 @@ type CheClusterSpecServer struct {
// This is disabled by default.
// +optional
SelfSignedCert bool `json:"selfSignedCert"`
// If enabled, then the certificate from `che-git-self-signed-cert`
// config map will be propagated to the Che components and provide particular
// configuration for Git.
// +optional
GitSelfSignedCert bool `json:"gitSelfSignedCert"`
// Instructs the operator to deploy Che in TLS mode, ie with TLS routes or ingresses.
// This is disabled by default.
......@@ -430,7 +434,14 @@ type CheCluster struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
// Desired configuration of the Che installation.
// Based on these settings, the operator automatically creates and maintains
// several config maps that will contain the appropriate environment variables
// the various components of the Che installation.
// These generated config maps should NOT be updated manually.
Spec CheClusterSpec `json:"spec,omitempty"`
// CheClusterStatus defines the observed state of Che installation
Status CheClusterStatus `json:"status,omitempty"`
}
......
......@@ -26,7 +26,6 @@ func schema_pkg_apis_org_v1_CheCluster(ref common.ReferenceCallback) common.Open
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
Description: "The `CheCluster` custom resource allows defining and managing a Che server installation",
Type: []string{"object"},
Properties: map[string]spec.Schema{
"kind": {
SchemaProps: spec.SchemaProps{
......@@ -49,12 +48,14 @@ func schema_pkg_apis_org_v1_CheCluster(ref common.ReferenceCallback) common.Open
},
"spec": {
SchemaProps: spec.SchemaProps{
Ref: ref("github.com/eclipse/che-operator/pkg/apis/org/v1.CheClusterSpec"),
Description: "Desired configuration of the Che installation. Based on these settings, the operator automatically creates and maintains several config maps that will contain the appropriate environment variables the various components of the Che installation. These generated config maps should NOT be updated manually.",
Ref: ref("github.com/eclipse/che-operator/pkg/apis/org/v1.CheClusterSpec"),
},
},
"status": {
SchemaProps: spec.SchemaProps{
Ref: ref("github.com/eclipse/che-operator/pkg/apis/org/v1.CheClusterStatus"),
Description: "CheClusterStatus defines the observed state of Che installation",
Ref: ref("github.com/eclipse/che-operator/pkg/apis/org/v1.CheClusterStatus"),
},
},
},
......@@ -70,7 +71,6 @@ func schema_pkg_apis_org_v1_CheClusterSpec(ref common.ReferenceCallback) common.
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
Description: "Desired configuration of the Che installation. Based on these settings, the operator automatically creates and maintains several config maps that will contain the appropriate environment variables the various components of the Che installation. These generated config maps should NOT be updated manually.",
Type: []string{"object"},
Properties: map[string]spec.Schema{
"server": {
SchemaProps: spec.SchemaProps{
......@@ -121,7 +121,6 @@ func schema_pkg_apis_org_v1_CheClusterSpecAuth(ref common.ReferenceCallback) com
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
Description: "Configuration settings related to the Authentication used by the Che installation.",
Type: []string{"object"},
Properties: map[string]spec.Schema{
"externalIdentityProvider": {
SchemaProps: spec.SchemaProps{
......@@ -217,6 +216,7 @@ func schema_pkg_apis_org_v1_CheClusterSpecAuth(ref common.ReferenceCallback) com
},
},
},
Dependencies: []string{},
}
}
......@@ -225,7 +225,6 @@ func schema_pkg_apis_org_v1_CheClusterSpecDB(ref common.ReferenceCallback) commo
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
Description: "Configuration settings related to the database used by the Che installation.",
Type: []string{"object"},
Properties: map[string]spec.Schema{
"externalDb": {
SchemaProps: spec.SchemaProps{
......@@ -286,6 +285,7 @@ func schema_pkg_apis_org_v1_CheClusterSpecDB(ref common.ReferenceCallback) commo
},
},
},
Dependencies: []string{},
}
}
......@@ -294,7 +294,6 @@ func schema_pkg_apis_org_v1_CheClusterSpecK8SOnly(ref common.ReferenceCallback)
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
Description: "Configuration settings specific to Che installations made on upstream Kubernetes.",
Type: []string{"object"},
Properties: map[string]spec.Schema{
"ingressDomain": {
SchemaProps: spec.SchemaProps{
......@@ -341,6 +340,7 @@ func schema_pkg_apis_org_v1_CheClusterSpecK8SOnly(ref common.ReferenceCallback)
},
},
},
Dependencies: []string{},
}
}
......@@ -349,7 +349,6 @@ func schema_pkg_apis_org_v1_CheClusterSpecServer(ref common.ReferenceCallback) c
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
Description: "General configuration settings related to the Che server and the plugin and devfile registries.",
Type: []string{"object"},
Properties: map[string]spec.Schema{
"airGapContainerRegistryHostname": {
SchemaProps: spec.SchemaProps{
......@@ -442,6 +441,13 @@ func schema_pkg_apis_org_v1_CheClusterSpecServer(ref common.ReferenceCallback) c
Format: "",
},
},
"gitSelfSignedCert": {
SchemaProps: spec.SchemaProps{
Description: "If enabled, then the certificate from `che-git-self-signed-cert` config map will be propagated to the Che components and provide particular configuration for Git.",
Type: []string{"boolean"},
Format: "",
},
},
"tlsSupport": {
SchemaProps: spec.SchemaProps{
Description: "Instructs the operator to deploy Che in TLS mode, ie with TLS routes or ingresses. This is disabled by default. WARNING: Enabling TLS might require enabling the `selfSignedCert` field also in some cases.",
......@@ -538,7 +544,6 @@ func schema_pkg_apis_org_v1_CheClusterSpecServer(ref common.ReferenceCallback) c
Description: "Map of additional environment variables that will be applied in the generated `che` config map to be used by the Che server, in addition to the values already generated from other fields of the `CheCluster` custom resource (CR). If `customCheProperties` contains a property that would be normally generated in `che` config map from other CR fields, then the value defined in the `customCheProperties` will be used instead.",
Type: []string{"object"},
AdditionalProperties: &spec.SchemaOrBool{
Allows: true,
Schema: &spec.Schema{
SchemaProps: spec.SchemaProps{
Type: []string{"string"},
......@@ -600,6 +605,7 @@ func schema_pkg_apis_org_v1_CheClusterSpecServer(ref common.ReferenceCallback) c
},
},
},
Dependencies: []string{},
}
}
......@@ -608,7 +614,6 @@ func schema_pkg_apis_org_v1_CheClusterSpecStorage(ref common.ReferenceCallback)
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
Description: "Configuration settings related to the persistent storage used by the Che installation.",
Type: []string{"object"},
Properties: map[string]spec.Schema{
"pvcStrategy": {
SchemaProps: spec.SchemaProps{
......@@ -655,5 +660,6 @@ func schema_pkg_apis_org_v1_CheClusterSpecStorage(ref common.ReferenceCallback)
},
},
},
Dependencies: []string{},
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment