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

chore: Remove Che opertor memory limit workaround #1190

Merged
merged 2 commits into from
Nov 22, 2021
Merged

chore: Remove Che opertor memory limit workaround #1190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
085d782
Remove Che opertor memory limit workaround
mmorhun Nov 22, 2021
113ba46
Update metadata
mmorhun Nov 22, 2021
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
9 changes: 9 additions & 0 deletions api/v1/checluster_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ type CheClusterSpecServer struct {
// +optional
CheHost string `json:"cheHost,omitempty"`
// Name of a secret containing certificates to secure ingress or route for the custom host name of the installed Che server.
// The secret must have `app.kubernetes.io/part-of=che.eclipse.org` label.
// See the `cheHost` field.
// +optional
CheHostTLSSecret string `json:"cheHostTLSSecret,omitempty"`
Expand All @@ -114,10 +115,12 @@ type CheClusterSpecServer struct {
// +optional
CheDebug string `json:"cheDebug,omitempty"`
// A comma-separated list of ClusterRoles that will be assigned to Che ServiceAccount.
// Each role must have `app.kubernetes.io/part-of=che.eclipse.org` label.
// Be aware that the Che Operator has to already have all permissions in these ClusterRoles to grant them.
// +optional
CheClusterRoles string `json:"cheClusterRoles,omitempty"`
// Custom cluster role bound to the user for the Che workspaces.
// The role must have `app.kubernetes.io/part-of=che.eclipse.org` label.
// The default roles are used when omitted or left blank.
// +optional
CheWorkspaceClusterRole string `json:"cheWorkspaceClusterRole,omitempty"`
Expand All @@ -140,9 +143,11 @@ type CheClusterSpecServer struct {
// Name of the ConfigMap with public certificates to add to Java trust store of the Che server.
// This is often required when adding the OpenShift OAuth provider, which has HTTPS endpoint signed with self-signed cert.
// The Che server must be aware of its CA cert to be able to request it. This is disabled by default.
// The Config Map must have `app.kubernetes.io/part-of=che.eclipse.org` label.
// +optional
ServerTrustStoreConfigMapName string `json:"serverTrustStoreConfigMapName,omitempty"`
// When enabled, the certificate from `che-git-self-signed-cert` ConfigMap will be propagated to the Che components and provide particular configuration for Git.
// Note, the `che-git-self-signed-cert` ConfigMap must have `app.kubernetes.io/part-of=che.eclipse.org` label.
// +optional
GitSelfSignedCert bool `json:"gitSelfSignedCert"`
// Deprecated. Instructs the Operator to deploy Che in TLS mode. This is enabled by default. Disabling TLS sometimes cause malfunction of some Che components.
Expand Down Expand Up @@ -296,6 +301,7 @@ type CheClusterSpecServer struct {
// +optional
ProxyPassword string `json:"proxyPassword,omitempty"`
// The secret that contains `user` and `password` for a proxy server. When the secret is defined, the `proxyUser` and `proxyPassword` are ignored.
// The secret must have `app.kubernetes.io/part-of=che.eclipse.org` label.
// +optional
ProxySecret string `json:"proxySecret,omitempty"`
// Overrides the memory request used in the Che server deployment. Defaults to 512Mi.
Expand Down Expand Up @@ -369,6 +375,7 @@ type CheClusterSpecDB struct {
// 1. `chePostgresUser` and `chePostgresPassword` are defined, then they will be used to connect to the DB.
// 2. `chePostgresUser` or `chePostgresPassword` are not defined, then a new secret with the name `che-postgres-secret`
// will be created with default value of `pgche` for `user` and with an auto-generated value for `password`.
// The secret must have `app.kubernetes.io/part-of=che.eclipse.org` label.
// +optional
ChePostgresSecret string `json:"chePostgresSecret,omitempty"`
// Overrides the container image used in the PostgreSQL database deployment. This includes the image tag. Omit it or leave it empty to use the default container image provided by the Operator.
Expand Down Expand Up @@ -422,6 +429,7 @@ type CheClusterSpecAuth struct {
// 1. `identityProviderAdminUserName` and `identityProviderPassword` are defined, then they will be used.
// 2. `identityProviderAdminUserName` or `identityProviderPassword` are not defined, then a new secret with the name
// `che-identity-secret` will be created with default value `admin` for `user` and with an auto-generated value for `password`.
// The secret must have `app.kubernetes.io/part-of=che.eclipse.org` label.
// +optional
IdentityProviderSecret string `json:"identityProviderSecret,omitempty"`
// Name of a Identity provider, Keycloak or RH-SSO, realm that is used for Che.
Expand All @@ -443,6 +451,7 @@ type CheClusterSpecAuth struct {
// When the secret is defined, the `identityProviderPostgresPassword` is ignored. When the value is omitted or left blank, the one of following scenarios applies:
// 1. `identityProviderPostgresPassword` is defined, then it will be used to connect to the database.
// 2. `identityProviderPostgresPassword` is not defined, then a new secret with the name `che-identity-postgres-secret` will be created with an auto-generated value for `password`.
// The secret must have `app.kubernetes.io/part-of=che.eclipse.org` label.
// +optional
IdentityProviderPostgresSecret string `json:"identityProviderPostgresSecret,omitempty"`
// Forces the default `admin` Che user to update password on first login. Defaults to `false`.
Expand Down
6 changes: 3 additions & 3 deletions ...amespaces/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ metadata:
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
repository: https://github.com/eclipse-che/che-operator
support: Eclipse Foundation
name: eclipse-che-preview-openshift.v7.40.0-373.next
name: eclipse-che-preview-openshift.v7.40.0-374.next
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -1175,7 +1175,7 @@ spec:
resources:
limits:
cpu: 500m
memory: 5Gi
memory: 256Mi
requests:
cpu: 100m
memory: 64Mi
Expand Down Expand Up @@ -1427,4 +1427,4 @@ spec:
maturity: stable
provider:
name: Eclipse Foundation
version: 7.40.0-373.next
version: 7.40.0-374.next
33 changes: 21 additions & 12 deletions bundle/next-all-namespaces/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 @@ -174,7 +174,9 @@ spec:
is defined, then it will be used to connect to the database.
2. `identityProviderPostgresPassword` is not defined, then
a new secret with the name `che-identity-postgres-secret`
will be created with an auto-generated value for `password`.'
will be created with an auto-generated value for `password`.
The secret must have `app.kubernetes.io/part-of=che.eclipse.org`
label.'
type: string
identityProviderRealm:
description: Name of a Identity provider, Keycloak or RH-SSO,
Expand Down Expand Up @@ -215,7 +217,8 @@ spec:
or `identityProviderPassword` are not defined, then a new
secret with the name `che-identity-secret` will be created
with default value `admin` for `user` and with an auto-generated
value for `password`.'
value for `password`. The secret must have `app.kubernetes.io/part-of=che.eclipse.org`
label.'
type: string
identityProviderURL:
description: Public URL of the Identity Provider server (Keycloak
Expand Down Expand Up @@ -328,7 +331,8 @@ spec:
to connect to the DB. 2. `chePostgresUser` or `chePostgresPassword`
are not defined, then a new secret with the name `che-postgres-secret`
will be created with default value of `pgche` for `user` and
with an auto-generated value for `password`.'
with an auto-generated value for `password`. The secret must
have `app.kubernetes.io/part-of=che.eclipse.org` label.'
type: string
chePostgresUser:
description: PostgreSQL user that the Che server uses to connect
Expand Down Expand Up @@ -513,9 +517,9 @@ spec:
type: boolean
cheClusterRoles:
description: A comma-separated list of ClusterRoles that will
be assigned to Che ServiceAccount. Be aware that the Che Operator
has to already have all permissions in these ClusterRoles
to grant them.
be assigned to Che ServiceAccount. Each role must have `app.kubernetes.io/part-of=che.eclipse.org`
label. Be aware that the Che Operator has to already have
all permissions in these ClusterRoles to grant them.
type: string
cheDebug:
description: Enables the debug mode for Che server. Defaults
Expand All @@ -536,7 +540,8 @@ spec:
cheHostTLSSecret:
description: Name of a secret containing certificates to secure
ingress or route for the custom host name of the installed
Che server. See the `cheHost` field.
Che server. The secret must have `app.kubernetes.io/part-of=che.eclipse.org`
label. See the `cheHost` field.
type: string
cheImage:
description: Overrides the container image used in Che deployment.
Expand Down Expand Up @@ -598,8 +603,8 @@ spec:
type: object
cheWorkspaceClusterRole:
description: Custom cluster role bound to the user for the Che
workspaces. The default roles are used when omitted or left
blank.
workspaces. The role must have `app.kubernetes.io/part-of=che.eclipse.org`
label. The default roles are used when omitted or left blank.
type: string
customCheProperties:
additionalProperties:
Expand Down Expand Up @@ -783,7 +788,9 @@ spec:
gitSelfSignedCert:
description: When enabled, the certificate from `che-git-self-signed-cert`
ConfigMap will be propagated to the Che components and provide
particular configuration for Git.
particular configuration for Git. Note, the `che-git-self-signed-cert`
ConfigMap must have `app.kubernetes.io/part-of=che.eclipse.org`
label.
type: boolean
nonProxyHosts:
description: 'List of hosts that will be reached directly, bypassing
Expand Down Expand Up @@ -882,7 +889,8 @@ spec:
proxySecret:
description: The secret that contains `user` and `password`
for a proxy server. When the secret is defined, the `proxyUser`
and `proxyPassword` are ignored.
and `proxyPassword` are ignored. The secret must have `app.kubernetes.io/part-of=che.eclipse.org`
label.
type: string
proxyURL:
description: URL (protocol+host name) of the proxy server. This
Expand Down Expand Up @@ -942,7 +950,8 @@ spec:
required when adding the OpenShift OAuth provider, which has
HTTPS endpoint signed with self-signed cert. The Che server
must be aware of its CA cert to be able to request it. This
is disabled by default.
is disabled by default. The Config Map must have `app.kubernetes.io/part-of=che.eclipse.org`
label.
type: string
singleHostGatewayConfigMapLabels:
additionalProperties:
Expand Down
6 changes: 3 additions & 3 deletions bundle/next/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ metadata:
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
repository: https://github.com/eclipse-che/che-operator
support: Eclipse Foundation
name: eclipse-che-preview-kubernetes.v7.40.0-334.next
name: eclipse-che-preview-kubernetes.v7.40.0-335.next
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -1164,7 +1164,7 @@ spec:
resources:
limits:
cpu: 500m
memory: 5Gi
memory: 256Mi
requests:
cpu: 100m
memory: 64Mi
Expand Down Expand Up @@ -1394,4 +1394,4 @@ spec:
maturity: stable
provider:
name: Eclipse Foundation
version: 7.40.0-334.next
version: 7.40.0-335.next
Loading