Skip to content

Commit

Permalink
Replace eclipse organization occurrence on eclipse-che (#727)
Browse files Browse the repository at this point in the history
* Replace eclipse organization occurrence on eclipse-che

Signed-off-by: Anatolii Bazko <abazko@redhat.com>
  • Loading branch information
tolusha authored Mar 22, 2021
1 parent a5cbdf7 commit 4091005
Show file tree
Hide file tree
Showing 144 changed files with 290 additions and 286 deletions.
4 changes: 2 additions & 2 deletions .ci/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Che-Operator CI
Che Operator currently support two CI flows for Pull Request checks:
- [Github Actions](https://github.com/eclipse/che-operator/actions)
- [Github Actions](https://github.com/eclipse-che/che-operator/actions)
- [Openshift CI](https://prow.ci.openshift.org/?job=*che*operator*)

## Openshift CI
Expand All @@ -9,7 +9,7 @@ Openshift is a Kubernetes based CI/CD system. Jobs can be triggered by various t

All documentation about how to onboard components in Openshift CI can be found in the Openshift CI jobs [repository](https://github.com/openshift/release). One of the requirements to make changes in Openshift CI jobs is being an openshift GitHub member.

All Che operator jobs configurations are defined in `https://github.com/openshift/release/tree/master/ci-operator/config/eclipse/che-operator`.
All Che operator jobs configurations are defined in `https://github.com/openshift/release/tree/master/ci-operator/config/eclipse-che/che-operator`.

### Jobs
- `che-operator-update` - It tests Eclipse Che update from the latest Eclipse Che release version to a new version from the PR and workspace startup. Note this PR check runs against `master` branch and all `7.x.y` branches.
Expand Down
6 changes: 3 additions & 3 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!-- Please review the following before submitting a PR:
che-operator Development Guide: https://github.com/eclipse/che-operator/#development
che-operator Development Guide: https://github.com/eclipse-che/che-operator/#development
-->

### What does this PR do?
Expand Down Expand Up @@ -30,8 +30,8 @@ che-operator Development Guide: https://github.com/eclipse/che-operator/#develop
- [ ] [Code produced is complete](https://github.com/eclipse/che/blob/master/CONTRIBUTING.md#code-produced-is-complete)
- [ ] [Code builds without errors](https://github.com/eclipse/che/blob/master/CONTRIBUTING.md#code-builds-without-errors)
- [ ] [Tests are covering the bugfix](https://github.com/eclipse/che/blob/master/CONTRIBUTING.md#tests-are-covering-the-bugfix)
- [ ] [Custom resource definition file is up to date](https://github.com/eclipse/che-operator/blob/master/README.md#updating-custom-resource-definition-file)
- [ ] [Nightly OLM bundle is up to date](https://github.com/eclipse/che-operator/blob/master/README.md#update-nightly-olm-bundle)
- [ ] [Custom resource definition file is up to date](https://github.com/eclipse-che/che-operator/blob/master/README.md#updating-custom-resource-definition-file)
- [ ] [Nightly OLM bundle is up to date](https://github.com/eclipse-che/che-operator/blob/master/README.md#update-nightly-olm-bundle)
- [ ] [The repository devfile is up to date and works](https://github.com/eclipse/che/blob/master/CONTRIBUTING.md#the-repository-devfile-is-up-to-date-and-works)
- [ ] [Sections `What issues does this PR fix or reference` and `How to test this PR` completed](https://github.com/eclipse/che/blob/master/CONTRIBUTING.md#sections-what-issues-does-this-pr-fix-or-reference-and-how-to-test-this-pr-completed)
- [ ] [Relevant user documentation updated](https://github.com/eclipse/che/blob/master/CONTRIBUTING.md#relevant-contributing-documentation-updated)
Expand Down
4 changes: 2 additions & 2 deletions .github/bin/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ initStableTemplates() {
export PREVIOUS_OPERATOR_TEMPLATE=${previousOperatorPath}/chectl/templates

# clone the exact versions to use their templates
git clone --depth 1 --branch ${PREVIOUS_PACKAGE_VERSION} https://github.com/eclipse/che-operator/ ${previousOperatorPath}
git clone --depth 1 --branch ${LAST_PACKAGE_VERSION} https://github.com/eclipse/che-operator/ ${lastOperatorPath}
git clone --depth 1 --branch ${PREVIOUS_PACKAGE_VERSION} https://github.com/eclipse-che/che-operator/ ${previousOperatorPath}
git clone --depth 1 --branch ${LAST_PACKAGE_VERSION} https://github.com/eclipse-che/che-operator/ ${lastOperatorPath}

# chectl requires 'che-operator' template folder
mkdir -p "${LAST_OPERATOR_TEMPLATE}/che-operator"
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/check-nightly-olm-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ jobs:

- name: Che operator code check.
run: >-
env &&
go version &&
export GOROOT=/opt/hostedtoolcache/go/1.15.8/x64/ &&
export GOROOT=/opt/hostedtoolcache/go/1.15.10/x64/ &&
${GITHUB_WORKSPACE}/.github/bin/check-nightly-olm-bundle.sh
6 changes: 3 additions & 3 deletions .github/workflows/release-che-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ on:
forceflag:
description: 'To force creation of .x branch, use --force flag here'
default: ''
# trigger on commit to master branch of new CSVs, eg., https://github.com/eclipse/che-operator/pull/571/files
# trigger on commit to master branch of new CSVs, eg., https://github.com/eclipse-che/che-operator/pull/571/files
push:
branches:
branches:
- master
paths:
- 'deploy/olm-catalog/stable/eclipse-che-preview-*/manifests/che-operator.clusterserviceversion.yaml'
Expand Down Expand Up @@ -47,7 +47,7 @@ jobs:
chedocsVersion="${{ github.event.inputs.version }}"
fi
# generic method to call a GH action and pass in a single var=val parameter
# generic method to call a GH action and pass in a single var=val parameter
invokeAction() {
this_repo=$1
this_action_name=$2
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-chectl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ on:
forceflag:
description: 'To force creation of .x branch, use --force flag here'
default: ''
# trigger on commit to master branch of new CSVs, eg., https://github.com/eclipse/che-operator/pull/571/files
# trigger on commit to master branch of new CSVs, eg., https://github.com/eclipse-che/che-operator/pull/571/files
push:
branches:
branches:
- master
paths:
- 'deploy/olm-catalog/stable/eclipse-che-preview-*/manifests/che-operator.clusterserviceversion.yaml'
Expand Down Expand Up @@ -47,7 +47,7 @@ jobs:
chectlVersion="${{ github.event.inputs.version }}"
fi
# generic method to call a GH action and pass in a single var=val parameter
# generic method to call a GH action and pass in a single var=val parameter
invokeAction() {
this_repo=$1
this_action_name=$2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-community-operator-PRs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ on:
forceflag:
description: 'To update an existing PR, use -f or --force flag here'
default: ''
# trigger on commit to master branch of new CSVs, eg., https://github.com/eclipse/che-operator/pull/571/files
# trigger on commit to master branch of new CSVs, eg., https://github.com/eclipse-che/che-operator/pull/571/files
push:
branches:
branches:
- master
paths:
- 'deploy/olm-catalog/stable/eclipse-che-preview-*/manifests/che-operator.clusterserviceversion.yaml'
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ $ export NO_DATE_UPDATE="true" \

### Che operator PR checks

Documentation about all Che operator test cases can be found [here](https://github.com/eclipse/che-operator/tree/master/.ci/README.md)
Documentation about all Che operator test cases can be found [here](https://github.com/eclipse-che/che-operator/tree/master/.ci/README.md)

### Generate go mocks.

Expand Down
10 changes: 5 additions & 5 deletions cmd/manager/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@ import (
"runtime"

image_puller_api "github.com/che-incubator/kubernetes-image-puller-operator/pkg/apis"
"github.com/eclipse/che-operator/cmd/manager/signal"
"github.com/eclipse/che-operator/pkg/util"
"github.com/eclipse-che/che-operator/cmd/manager/signal"
"github.com/eclipse-che/che-operator/pkg/util"
operatorsv1 "github.com/operator-framework/api/pkg/operators/v1"
operatorsv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
packagesv1 "github.com/operator-framework/operator-lifecycle-manager/pkg/package-server/apis/operators/v1"
"github.com/operator-framework/operator-sdk/pkg/k8sutil"
"github.com/prometheus/common/log"
"github.com/sirupsen/logrus"

"github.com/eclipse/che-operator/pkg/apis"
"github.com/eclipse/che-operator/pkg/controller"
"github.com/eclipse/che-operator/pkg/deploy"
"github.com/eclipse-che/che-operator/pkg/apis"
"github.com/eclipse-che/che-operator/pkg/controller"
"github.com/eclipse-che/che-operator/pkg/deploy"
"github.com/operator-framework/operator-sdk/pkg/leader"
"github.com/operator-framework/operator-sdk/pkg/ready"
sdkVersion "github.com/operator-framework/operator-sdk/version"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,13 @@ metadata:
categories: Developer Tools
certified: "false"
containerImage: quay.io/eclipse/che-operator:nightly
createdAt: "2021-03-15T13:14:32Z"
createdAt: "2021-03-22T07:33:48Z"
description: A Kube-native development solution that delivers portable and collaborative
developer workspaces.
operatorframework.io/suggested-namespace: eclipse-che
repository: https://github.com/eclipse/che-operator
repository: https://github.com/eclipse-che/che-operator
support: Eclipse Foundation
name: eclipse-che-preview-kubernetes.v7.28.0-126.nightly
name: eclipse-che-preview-kubernetes.v7.28.0-128.nightly
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -782,11 +782,11 @@ spec:
- name: Documentation
url: https://www.eclipse.org/che/docs
- name: Operator GitHub Repo
url: https://github.com/eclipse/che-operator
url: https://github.com/eclipse-che/che-operator
maintainers:
- email: dfestal@redhat.com
name: David Festal
maturity: stable
provider:
name: Eclipse Foundation
version: 7.28.0-126.nightly
version: 7.28.0-128.nightly
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,13 @@ metadata:
categories: Developer Tools, OpenShift Optional
certified: "false"
containerImage: quay.io/eclipse/che-operator:nightly
createdAt: "2021-03-15T13:14:43Z"
createdAt: "2021-03-22T07:33:58Z"
description: A Kube-native development solution that delivers portable and collaborative
developer workspaces in OpenShift.
operatorframework.io/suggested-namespace: eclipse-che
repository: https://github.com/eclipse/che-operator
repository: https://github.com/eclipse-che/che-operator
support: Eclipse Foundation
name: eclipse-che-preview-openshift.v7.28.0-126.nightly
name: eclipse-che-preview-openshift.v7.28.0-128.nightly
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -859,11 +859,11 @@ spec:
- name: Documentation
url: https://www.eclipse.org/che/docs
- name: Operator GitHub Repo
url: https://github.com/eclipse/che-operator
url: https://github.com/eclipse-che/che-operator
maintainers:
- email: dfestal@redhat.com
name: David Festal
maturity: stable
provider:
name: Eclipse Foundation
version: 7.28.0-126.nightly
version: 7.28.0-128.nightly
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ metadata:
description: A Kube-native development solution that delivers portable and collaborative
developer workspaces.
operatorframework.io/suggested-namespace: eclipse-che
repository: https://github.com/eclipse/che-operator
repository: https://github.com/eclipse-che/che-operator
support: Eclipse Foundation
name: eclipse-che-preview-kubernetes.v7.27.2
namespace: placeholder
Expand Down Expand Up @@ -938,7 +938,7 @@ spec:
- name: Documentation
url: https://www.eclipse.org/che/docs
- name: Operator GitHub Repo
url: https://github.com/eclipse/che-operator
url: https://github.com/eclipse-che/che-operator
maintainers:
- email: dfestal@redhat.com
name: David Festal
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
description: A Kube-native development solution that delivers portable and collaborative
developer workspaces.
operatorframework.io/suggested-namespace: eclipse-che
repository: https://github.com/eclipse/che-operator
repository: https://github.com/eclipse-che/che-operator
support: Eclipse Foundation
- name: eclipse-che-preview-kubernetes.v7.27.1
+ name: eclipse-che-preview-kubernetes.v7.27.2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ metadata:
description: A Kube-native development solution that delivers portable and collaborative
developer workspaces in OpenShift.
operatorframework.io/suggested-namespace: eclipse-che
repository: https://github.com/eclipse/che-operator
repository: https://github.com/eclipse-che/che-operator
support: Eclipse Foundation
name: eclipse-che-preview-openshift.v7.27.2
namespace: placeholder
Expand Down Expand Up @@ -1015,7 +1015,7 @@ spec:
- name: Documentation
url: https://www.eclipse.org/che/docs
- name: Operator GitHub Repo
url: https://github.com/eclipse/che-operator
url: https://github.com/eclipse-che/che-operator
maintainers:
- email: dfestal@redhat.com
name: David Festal
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
description: A Kube-native development solution that delivers portable and collaborative
developer workspaces in OpenShift.
operatorframework.io/suggested-namespace: eclipse-che
repository: https://github.com/eclipse/che-operator
repository: https://github.com/eclipse-che/che-operator
support: Eclipse Foundation
- name: eclipse-che-preview-openshift.v7.27.1
+ name: eclipse-che-preview-openshift.v7.27.2
Expand Down
4 changes: 2 additions & 2 deletions devfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ metadata:
projects:
- name: che-operator
source:
location: 'https://github.com/eclipse/che-operator.git'
location: 'https://github.com/eclipse-che/che-operator.git'
type: git
branch: master
clonePath: src/github.com/eclipse/che-operator
clonePath: src/github.com/eclipse-che/che-operator
components:
- id: golang/go/latest
memoryLimit: 1G
Expand Down
2 changes: 1 addition & 1 deletion e2e/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
package main

import (
orgv1 "github.com/eclipse/che-operator/pkg/apis/org/v1"
orgv1 "github.com/eclipse-che/che-operator/pkg/apis/org/v1"
oauth "github.com/openshift/api/oauth/v1"
"github.com/sirupsen/logrus"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
4 changes: 2 additions & 2 deletions e2e/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
package main

import (
orgv1 "github.com/eclipse/che-operator/pkg/apis/org/v1"
"github.com/eclipse/che-operator/pkg/util"
orgv1 "github.com/eclipse-che/che-operator/pkg/apis/org/v1"
"github.com/eclipse-che/che-operator/pkg/util"
"github.com/sirupsen/logrus"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
Expand Down
12 changes: 6 additions & 6 deletions e2e/run_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -76,21 +76,21 @@ run_tests() {
oc apply -f ${OPERATOR_REPO}/deploy/crds/org_v1_che_crd.yaml

oc_tls_mode

printInfo "Compile tests binary"
docker run -t \
-v ${OPERATOR_REPO}/tmp:/operator \
-v ${OPERATOR_REPO}:/opt/app-root/src/go/src/github.com/eclipse/che-operator registry.access.redhat.com/devtools/go-toolset-rhel7:${GO_TOOLSET_VERSION} \
sh -c "OOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o /operator/run-tests /opt/app-root/src/go/src/github.com/eclipse/che-operator/e2e/*.go"
-v ${OPERATOR_REPO}:/opt/app-root/src/go/src/github.com/eclipse-che/che-operator registry.access.redhat.com/devtools/go-toolset-rhel7:${GO_TOOLSET_VERSION} \
sh -c "OOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o /operator/run-tests /opt/app-root/src/go/src/github.com/eclipse-che/che-operator/e2e/*.go"

printInfo "Build operator docker image and load in to minishift VM..."
cd ${OPERATOR_REPO} && docker build -t che/operator -f Dockerfile . && docker save che/operator > operator.tar
eval $(minishift docker-env) && docker load -i operator.tar && rm operator.tar

printInfo "Run tests..."
${OPERATOR_REPO}/tmp/run-tests
}

init
run_tests
#TODO avoid the use of cd on shell...
#TODO avoid the use of cd on shell...
4 changes: 2 additions & 2 deletions e2e/tests.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ package main
import (
"log"

orgv1 "github.com/eclipse/che-operator/pkg/apis/org/v1"
"github.com/eclipse/che-operator/pkg/controller/che"
orgv1 "github.com/eclipse-che/che-operator/pkg/apis/org/v1"
"github.com/eclipse-che/che-operator/pkg/controller/che"
"github.com/sirupsen/logrus"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/kubernetes/scheme"
Expand Down
3 changes: 2 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
module github.com/eclipse/che-operator
module github.com/eclipse-che/che-operator

go 1.13

require (
github.com/che-incubator/kubernetes-image-puller-operator v0.0.0-20200901231735-f852a5a3ea5c
github.com/eclipse/che-operator v0.0.0-20210322071915-d17965597500 // indirect
github.com/golang/mock v1.3.1
github.com/google/go-cmp v0.4.0
github.com/openshift/api v3.9.1-0.20190924102528-32369d4db2ad+incompatible
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,8 @@ github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5m
github.com/eapache/go-resiliency v1.2.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
github.com/eclipse/che-operator v0.0.0-20210322071915-d17965597500 h1:HZIcRYU66HA4U5oI/DYgLh8QTQN+ojDRXClQ0x6432w=
github.com/eclipse/che-operator v0.0.0-20210322071915-d17965597500/go.mod h1:F4QPvW5UgKdlSXFdZtyT/FVQfqTTc/ImfBf4Ia71i2Y=
github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e h1:p1yVGRW3nmb85p1Sh1ZJSDm4A4iKLS5QNbvUHMgGu/M=
github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
Expand Down
4 changes: 2 additions & 2 deletions make-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ init() {
RELEASE="$1"
BRANCH=$(echo $RELEASE | sed 's/.$/x/')
RELEASE_BRANCH="${RELEASE}-release"
GIT_REMOTE_UPSTREAM="https://github.com/eclipse/che-operator.git"
GIT_REMOTE_UPSTREAM="https://github.com/eclipse-che/che-operator.git"
RUN_RELEASE=false
PUSH_OLM_BUNDLES=false
PUSH_GIT_CHANGES=false
Expand Down Expand Up @@ -194,7 +194,7 @@ releaseOlmFiles() {
echo "[INFO] releaseOlmFiles :: Validate changes"
grep -q "version: "$RELEASE $openshift/che-operator.clusterserviceversion.yaml
grep -q "version: "$RELEASE $kubernetes/che-operator.clusterserviceversion.yaml

test -f $kubernetes/org_v1_che_crd.yaml
test -f $openshift/org_v1_che_crd.yaml

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ metadata:
description: A Kube-native development solution that delivers portable and collaborative
developer workspaces.
operatorframework.io/suggested-namespace: eclipse-che
repository: https://github.com/eclipse/che-operator
repository: https://github.com/eclipse-che/che-operator
support: Eclipse Foundation
name: eclipse-che-preview-kubernetes.v7.24.0
namespace: placeholder
Expand Down Expand Up @@ -641,7 +641,7 @@ spec:
- name: Documentation
url: https://www.eclipse.org/che/docs
- name: Operator GitHub Repo
url: https://github.com/eclipse/che-operator
url: https://github.com/eclipse-che/che-operator
maintainers:
- email: dfestal@redhat.com
name: David Festal
Expand Down
Loading

0 comments on commit 4091005

Please sign in to comment.