seg_yinzy
/
che-operator
mirror of https://github.com/eclipse-che/che-operator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: Update DevWorkspace Operator dependency to v0.12.3 (#1306) 

* Update DevWorkspace Operator dependency to v0.12.3

Signed-off-by: Angel Misevski <amisevsk@redhat.com>
Co-authored-by: Anatolii Bazko <abazko@redhat.com>
pull/1308/head
Angel Misevski 2022-02-02 05:19:42 -05:00 committed by GitHub
parent 12da7adeeb
commit dcffa0189e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPENDENCIES.md
View File

@ -460,4 +460,4 @@
| [golang.org/x/mobile@d3739f865fa66d07c1f506505c18aac71a8ead6e](https://cs.opensource.google/go) | BSD-3-Clause | N/A |
| [github.com/devfile/api/v2@03e023e7078b64884216d8e6dce8f0cf8b7e74d2](https://github.com/devfile/api.git) | Apache-2.0 | [CQ](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=23680) |
| [github.com/che-incubator/kubernetes-image-puller-operator@0128446f5af78587c0427a35d693bbb8d24036bc](https://github.com/che-incubator/kubernetes-image-puller-operator.git) | EPL-2.0 | todo |
| [github.com/devfile/devworkspace-operator@23b39b88fa997d92185645c94249f16446d1adf4](https://github.com/devfile/devworkspace-operator.git) | Apache-2.0 | [clearlydefined](https://clearlydefined.io/definitions/git/github/devfile/devworkspace-operator/23b39b88fa997d92185645c94249f16446d1adf4) |
| [github.com/devfile/devworkspace-operator@ec1a4cefefe5d77620c8f5f21624f41b7e8e9100](https://github.com/devfile/devworkspace-operator.git) | Apache-2.0 | [clearlydefined](https://clearlydefined.io/definitions/git/github/devfile/devworkspace-operator/ec1a4cefefe5d77620c8f5f21624f41b7e8e9100) |

2
Dockerfile
View File

@ -12,7 +12,7 @@
# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8/go-toolset
FROM registry.access.redhat.com/ubi8/go-toolset:1.16.12-2 as builder
ENV GOPATH=/go/
ARG DEV_WORKSPACE_CONTROLLER_VERSION="v0.12.1"
ARG DEV_WORKSPACE_CONTROLLER_VERSION="v0.12.3"
ARG DEV_HEADER_REWRITE_TRAEFIK_PLUGIN="main"
ARG TESTS="true"
USER root

2
Makefile
View File

@ -63,7 +63,7 @@ ECLIPSE_CHE_CRD_V1="$(CRD_FOLDER)/org_v1_che_crd.yaml"
# default crd names used operator-sdk from the box
ECLIPSE_CHE_CRD="$(CRD_FOLDER)/org.eclipse.che_checlusters.yaml"
DEV_WORKSPACE_CONTROLLER_VERSION="v0.12.1"
DEV_WORKSPACE_CONTROLLER_VERSION="v0.12.3"
DEV_HEADER_REWRITE_TRAEFIK_PLUGIN="main"
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)

8
bundle/next/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml
View File

@ -75,7 +75,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.43.0-420.next
name: eclipse-che-preview-openshift.v7.43.0-422.next
namespace: placeholder
spec:
apiservicedefinitions: {}
@ -968,7 +968,7 @@ spec:
- name: RELATED_IMAGE_devfile_registry
value: quay.io/eclipse/che-devfile-registry:next
- name: RELATED_IMAGE_pvc_jobs
value: registry.access.redhat.com/ubi8-minimal:8.5-218
value: registry.access.redhat.com/ubi8-minimal:8.5-230
- name: RELATED_IMAGE_postgres
value: quay.io/eclipse/che--centos--postgresql-96-centos7:9.6-b681d78125361519180a6ac05242c296f8906c11eab7e207b5ca9a89b6344392
- name: RELATED_IMAGE_postgres_13_3
@ -984,7 +984,7 @@ spec:
- name: RELATED_IMAGE_single_host_gateway_config_sidecar
value: quay.io/che-incubator/configbump:0.1.4
- name: RELATED_IMAGE_devworkspace_controller
value: quay.io/devfile/devworkspace-controller:v0.11.0
value: quay.io/devfile/devworkspace-controller:v0.12.3
- name: RELATED_IMAGE_gateway_authentication_sidecar
value: quay.io/openshift/origin-oauth-proxy:4.7
- name: RELATED_IMAGE_gateway_authorization_sidecar
@ -1288,4 +1288,4 @@ spec:
maturity: stable
provider:
name: Eclipse Foundation
version: 7.43.0-420.next
version: 7.43.0-422.next

4
config/manager/manager.yaml
View File

@ -72,7 +72,7 @@ spec:
- name: RELATED_IMAGE_che_tls_secrets_creation_job
value: quay.io/eclipse/che-tls-secret-creator:alpine-01a4c34
- name: RELATED_IMAGE_pvc_jobs
value: registry.access.redhat.com/ubi8-minimal:8.5-218
value: registry.access.redhat.com/ubi8-minimal:8.5-230
- name: RELATED_IMAGE_postgres
value: quay.io/eclipse/che--centos--postgresql-96-centos7:9.6-b681d78125361519180a6ac05242c296f8906c11eab7e207b5ca9a89b6344392
- name: RELATED_IMAGE_postgres_13_3
@ -88,7 +88,7 @@ spec:
- name: RELATED_IMAGE_single_host_gateway_config_sidecar
value: quay.io/che-incubator/configbump:0.1.4
- name: RELATED_IMAGE_devworkspace_controller
value: quay.io/devfile/devworkspace-controller:v0.11.0
value: quay.io/devfile/devworkspace-controller:v0.12.3
- name: RELATED_IMAGE_gateway_authentication_sidecar
value: quay.io/openshift/origin-oauth-proxy:4.7
- name: RELATED_IMAGE_gateway_authorization_sidecar

2
go.mod
View File

@ -6,7 +6,7 @@ require (
github.com/Shopify/logrus-bugsnag v0.0.0-00010101000000-000000000000 // indirect
github.com/che-incubator/kubernetes-image-puller-operator v0.0.0-20210929175054-0128446f5af7
github.com/devfile/api/v2 v2.0.0-20210917193329-089a48011460
github.com/devfile/devworkspace-operator v0.12.2
github.com/devfile/devworkspace-operator v0.12.3
github.com/go-logr/logr v0.4.0
github.com/golang/mock v1.5.0
github.com/google/go-cmp v0.5.6

4
go.sum
View File

@ -114,8 +114,8 @@ github.com/deislabs/oras v0.8.1/go.mod h1:Mx0rMSbBNaNfY9hjpccEnxkOqJL6KGjtxNHPLC
github.com/denisenkom/go-mssqldb v0.0.0-20190204142019-df6d76eb9289/go.mod h1:xN/JuLBIz4bjkxNmByTiV1IbhfnYb6oo99phBn4Eqhc=
github.com/devfile/api/v2 v2.0.0-20210917193329-089a48011460 h1:cmd+3poyUwevcWchYdvE02YT1nQU4SJpA5/wrdLrpWE=
github.com/devfile/api/v2 v2.0.0-20210917193329-089a48011460/go.mod h1:kLX/nW93gigOHXK3NLeJL2fSS/sgEe+OHu8bo3aoOi4=
github.com/devfile/devworkspace-operator v0.12.2 h1:6D/2vHHJQACmJdr+uqKi8X4563yseQfs8Hyf25xHZ5k=
github.com/devfile/devworkspace-operator v0.12.2/go.mod h1:33uEtRwYsox/Jsuh5oqNc4iPNKtprazz15Jc0iX9aTU=
github.com/devfile/devworkspace-operator v0.12.3 h1:HMUfbQpDg5XBwHOLLiyUPb4hF4RJKVs95BTlL+OI6As=
github.com/devfile/devworkspace-operator v0.12.3/go.mod h1:33uEtRwYsox/Jsuh5oqNc4iPNKtprazz15Jc0iX9aTU=
github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
github.com/dhui/dktest v0.3.2/go.mod h1:l1/ib23a/CmxAe7yixtrYPc8Iy90Zy2udyaHINM5p58=

4
helmcharts/next/templates/manager.yaml
View File

@ -72,7 +72,7 @@ spec:
- name: RELATED_IMAGE_che_tls_secrets_creation_job
value: quay.io/eclipse/che-tls-secret-creator:alpine-01a4c34
- name: RELATED_IMAGE_pvc_jobs
value: registry.access.redhat.com/ubi8-minimal:8.5-218
value: registry.access.redhat.com/ubi8-minimal:8.5-230
- name: RELATED_IMAGE_postgres
value: quay.io/eclipse/che--centos--postgresql-96-centos7:9.6-b681d78125361519180a6ac05242c296f8906c11eab7e207b5ca9a89b6344392
- name: RELATED_IMAGE_postgres_13_3
@ -88,7 +88,7 @@ spec:
- name: RELATED_IMAGE_single_host_gateway_config_sidecar
value: quay.io/che-incubator/configbump:0.1.4
- name: RELATED_IMAGE_devworkspace_controller
value: quay.io/devfile/devworkspace-controller:v0.11.0
value: quay.io/devfile/devworkspace-controller:v0.12.3
- name: RELATED_IMAGE_gateway_authentication_sidecar
value: quay.io/openshift/origin-oauth-proxy:4.7
- name: RELATED_IMAGE_gateway_authorization_sidecar

2
vendor/github.com/devfile/devworkspace-operator/apis/controller/v1alpha1/zz_generated.deepcopy.go generated vendored
View File

@ -20,7 +20,7 @@
package v1alpha1
import (
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
)

6
vendor/github.com/devfile/devworkspace-operator/pkg/config/sync.go generated vendored
View File

@ -99,8 +99,12 @@ func SetupControllerConfig(client crclient.Client) error {
return nil
}
func IsSetUp() bool {
return internalConfig != nil
}
func ExperimentalFeaturesEnabled() bool {
if internalConfig.EnableExperimentalFeatures == nil {
if internalConfig == nil || internalConfig.EnableExperimentalFeatures == nil {
return false
}
return *internalConfig.EnableExperimentalFeatures

2
vendor/github.com/devfile/devworkspace-operator/pkg/provision/sync/sync.go generated vendored
View File

@ -125,7 +125,7 @@ func isMutableObject(obj crclient.Object) bool {
}
func printDiff(specObj, clusterObj crclient.Object, log logr.Logger) {
if config.ExperimentalFeaturesEnabled() {
if config.IsSetUp() && config.ExperimentalFeaturesEnabled() {
var diffOpts cmp.Options
switch specObj.(type) {
case *rbacv1.Role:

6
vendor/modules.txt vendored
View File

@ -19,8 +19,6 @@ github.com/BurntSushi/toml
## explicit
# github.com/beorn7/perks v1.0.1 => github.com/beorn7/perks v1.0.1
github.com/beorn7/perks/quantile
# github.com/bitly/go-simplejson v0.0.0-00010101000000-000000000000 => github.com/bitly/go-simplejson v0.0.0-20171023175154-0c965951289c
## explicit
# github.com/blang/semver v3.5.1+incompatible => github.com/blang/semver v3.5.1+incompatible
github.com/blang/semver
# github.com/blang/semver/v4 v4.0.0 => github.com/blang/semver/v4 v4.0.0
@ -37,7 +35,7 @@ github.com/davecgh/go-spew/spew
github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2
github.com/devfile/api/v2/pkg/attributes
github.com/devfile/api/v2/pkg/devfile
# github.com/devfile/devworkspace-operator v0.12.2
# github.com/devfile/devworkspace-operator v0.12.3
## explicit
github.com/devfile/devworkspace-operator/apis/controller/v1alpha1
github.com/devfile/devworkspace-operator/controllers/controller/devworkspacerouting
@ -328,8 +326,6 @@ google.golang.org/protobuf/types/known/durationpb
google.golang.org/protobuf/types/known/timestamppb
# gopkg.in/inf.v0 v0.9.1 => gopkg.in/inf.v0 v0.9.1
gopkg.in/inf.v0
# gopkg.in/tomb.v2 v2.0.0-00010101000000-000000000000 => gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637
## explicit
# gopkg.in/yaml.v2 v2.4.0 => gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v2
# honnef.co/go/tools v0.0.1-2020.1.3 => honnef.co/go/tools v0.0.0-20200822191040-81508471876c