Skip to content

Commit

Permalink
Merge pull request #319 from eclipse/update-images-to-master
Browse files Browse the repository at this point in the history
Copy nightly csv to master
  • Loading branch information
mkuznyetsov committed Jun 25, 2020
2 parents aee5ca3 + 5cbf731 commit 6fe4660
Show file tree
Hide file tree
Showing 21 changed files with 4,141 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ RUN export ARCH="$(uname -m)" && if [[ ${ARCH} == "x86_64" ]]; then export ARCH=
GOOS=linux GOARCH=${ARCH} CGO_ENABLED=0 go build -mod=vendor -o /tmp/che-operator/che-operator cmd/manager/main.go

# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8-minimal
FROM registry.access.redhat.com/ubi8-minimal:8.2-267
FROM registry.access.redhat.com/ubi8-minimal:8.2-301.1592810506

COPY --from=builder /tmp/che-operator/che-operator /usr/local/bin/che-operator
COPY --from=builder /che-operator/templates/keycloak_provision /tmp/keycloak_provision
Expand Down
2 changes: 1 addition & 1 deletion deploy/operator-local.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ spec:
- name: IMAGE_default_che_tls_secrets_creation_job
value: quay.io/eclipse/che-tls-secret-creator:alpine-3029769
- name: IMAGE_default_pvc_jobs
value: registry.access.redhat.com/ubi8-minimal:8.2-267
value: registry.access.redhat.com/ubi8-minimal:8.2-301.1592810506
- name: IMAGE_default_postgres
value: centos/postgresql-96-centos7:9.6
- name: IMAGE_default_keycloak
Expand Down
2 changes: 1 addition & 1 deletion deploy/operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ spec:
- name: IMAGE_default_che_tls_secrets_creation_job
value: quay.io/eclipse/che-tls-secret-creator:alpine-3029769
- name: IMAGE_default_pvc_jobs
value: registry.access.redhat.com/ubi8-minimal:8.2-267
value: registry.access.redhat.com/ubi8-minimal:8.2-301.1592810506
- name: IMAGE_default_postgres
value: centos/postgresql-96-centos7:9.6
- name: IMAGE_default_keycloak
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
--- /home/mykhailo/projects/release/che-operator/olm/eclipse-che-preview-kubernetes/deploy/olm-catalog/eclipse-che-preview-kubernetes/7.14.2/eclipse-che-preview-kubernetes.crd.yaml 2020-06-18 12:30:34.530966436 +0300
+++ /home/mykhailo/projects/release/che-operator/olm/eclipse-che-preview-kubernetes/deploy/olm-catalog/eclipse-che-preview-kubernetes/7.15.0/eclipse-che-preview-kubernetes.crd.yaml 2020-06-25 13:50:37.102440224 +0300
@@ -422,13 +422,9 @@
a proxy is required (see also the `proxyURL` `proxySecret` fields).
type: string
selfSignedCert:
- description: Enables the support of OpenShift clusters whose router
- uses self-signed certificates. When enabled, the operator retrieves
- the default self-signed certificate of OpenShift routes and adds
- it to the Java trust store of the Che server. This is usually
- required when activating the `tlsSupport` field on demo OpenShift
- clusters that have not been setup with a valid certificate for
- the routes. This is disabled by default.
+ description: Deprecated. The value of this flag is ignored. Che
+ operator will automatically detect if router certificate is self-signed.
+ If so it will be propagated to Che server and some other components.
type: boolean
serverMemoryLimit:
description: Overrides the memory limit used in the Che server deployment.
@@ -446,10 +442,9 @@
its CA cert to be able to request it. This is disabled by default.
type: string
tlsSupport:
- 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.'
+ description: Deprecated. Instructs the operator to deploy Che in
+ TLS mode. This is enabled by default. Disabling TLS may cause
+ malfunction of some Che components.
type: boolean
workspaceNamespaceDefault:
description: 'Defines Kubernetes default namespace in which user''s

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
--- /home/mykhailo/projects/release/che-operator/olm/eclipse-che-preview-kubernetes/deploy/olm-catalog/eclipse-che-preview-kubernetes/7.14.2/eclipse-che-preview-kubernetes.v7.14.2.clusterserviceversion.yaml 2020-06-18 12:30:34.530966436 +0300
+++ /home/mykhailo/projects/release/che-operator/olm/eclipse-che-preview-kubernetes/deploy/olm-catalog/eclipse-che-preview-kubernetes/7.15.0/eclipse-che-preview-kubernetes.v7.15.0.clusterserviceversion.yaml 2020-06-25 13:50:37.101440219 +0300
@@ -48,13 +48,13 @@
capabilities: Seamless Upgrades
categories: Developer Tools
certified: "false"
- containerImage: quay.io/eclipse/che-operator:7.14.2
- createdAt: "2020-06-10T13:13:16Z"
+ containerImage: quay.io/eclipse/che-operator:7.15.0
+ createdAt: "2020-06-25T10:50:37Z"
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.v7.14.2
+ name: eclipse-che-preview-kubernetes.v7.15.0
namespace: placeholder
spec:
apiservicedefinitions: {}
@@ -248,21 +248,21 @@
- name: OPERATOR_NAME
value: che-operator
- name: CHE_VERSION
- value: 7.14.2
+ value: 7.15.0
- name: IMAGE_default_che_server
- value: quay.io/eclipse/che-server:7.14.2
+ value: quay.io/eclipse/che-server:7.15.0
- name: IMAGE_default_plugin_registry
- value: quay.io/eclipse/che-plugin-registry:7.14.2
+ value: quay.io/eclipse/che-plugin-registry:7.15.0
- name: IMAGE_default_devfile_registry
- value: quay.io/eclipse/che-devfile-registry:7.14.2
+ value: quay.io/eclipse/che-devfile-registry:7.15.0
- name: IMAGE_default_che_tls_secrets_creation_job
value: quay.io/eclipse/che-tls-secret-creator:alpine-3029769
- name: IMAGE_default_pvc_jobs
- value: registry.access.redhat.com/ubi8-minimal:8.2-267
+ value: registry.access.redhat.com/ubi8-minimal:8.2-301.1592810506
- name: IMAGE_default_postgres
value: centos/postgresql-96-centos7:9.6
- name: IMAGE_default_keycloak
- value: quay.io/eclipse/che-keycloak:7.14.2
+ value: quay.io/eclipse/che-keycloak:7.15.0
- name: IMAGE_default_che_workspace_plugin_broker_metadata
value: quay.io/eclipse/che-plugin-metadata-broker:v3.2.0
- name: IMAGE_default_che_workspace_plugin_broker_artifacts
@@ -285,7 +285,7 @@
value: che-identity-postgres-secret
- name: CHE_POSTGRES_SECRET
value: che-postgres-secret
- image: quay.io/eclipse/che-operator:7.14.2
+ image: quay.io/eclipse/che-operator:7.15.0
imagePullPolicy: IfNotPresent
name: che-operator
ports:
@@ -394,5 +394,5 @@
maturity: stable
provider:
name: Eclipse Foundation
- replaces: eclipse-che-preview-kubernetes.v7.14.1
- version: 7.14.2
+ replaces: eclipse-che-preview-kubernetes.v7.14.2
+ version: 7.15.0
Loading

0 comments on commit 6fe4660

Please sign in to comment.