Skip to content

Commit

Permalink
rename go module name to stolostron (#125)
Browse files Browse the repository at this point in the history
* rename go module name to stolostron

Signed-off-by: Xiangjing Li <[email protected]>
  • Loading branch information
xiangjingli authored Jan 13, 2022
1 parent da0919b commit 6d97a1d
Show file tree
Hide file tree
Showing 26 changed files with 73 additions and 63 deletions.
15 changes: 3 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,7 @@ TRAVIS_BUILD ?= 1
# Image URL to use all building/pushing image targets;
# Use your own docker registry and image name for dev/test by overridding the IMG and REGISTRY environment variable.
IMG ?= $(shell cat COMPONENT_NAME 2> /dev/null)
REGISTRY ?= quay.io/open-cluster-management

# Github host to use for checking the source tree;
# Override this variable ue with your own value if you're working on forked repo.
GIT_HOST ?= github.com/open-cluster-management
REGISTRY ?= quay.io/stolostron

PWD := $(shell pwd)
BASE_DIR := $(shell basename $(PWD))
Expand All @@ -35,7 +31,6 @@ GOBIN_DEFAULT := $(GOPATH)/bin
export GOBIN ?= $(GOBIN_DEFAULT)
TESTARGS_DEFAULT := "-v"
export TESTARGS ?= $(TESTARGS_DEFAULT)
DEST ?= $(GOPATH)/src/$(GIT_HOST)/$(BASE_DIR)
VERSION ?= $(shell cat COMPONENT_VERSION 2> /dev/null)
IMAGE_NAME_AND_VERSION ?= $(REGISTRY)/$(IMG)

Expand All @@ -53,15 +48,11 @@ endif

.PHONY: fmt lint test build build-images

ifneq ("$(realpath $(DEST))", "$(realpath $(PWD))")
$(error Please run 'make' from $(DEST). Current directory is $(PWD))
endif

# GITHUB_USER containing '@' char must be escaped with '%40'
GITHUB_USER := $(shell echo $(GITHUB_USER) | sed 's/@/%40/g')
GITHUB_TOKEN ?=

GOPRIVATE := github.com/open-cluster-management
GOPRIVATE := github.com/stolostron

ifdef GITHUB_TOKEN
$(shell git config --global url."https://$(GITHUB_TOKEN):[email protected]/".insteadOf "https://github.com/")
Expand All @@ -71,7 +62,7 @@ USE_VENDORIZED_BUILD_HARNESS ?=

ifndef USE_VENDORIZED_BUILD_HARNESS
ifeq ($(TRAVIS_BUILD),1)
-include $(shell curl -H 'Authorization: token ${GITHUB_TOKEN}' -H 'Accept: application/vnd.github.v4.raw' -L https://api.github.com/repos/open-cluster-management/build-harness-extensions/contents/templates/Makefile.build-harness-bootstrap -o .build-harness-bootstrap; echo .build-harness-bootstrap)
-include $(shell curl -H 'Authorization: token ${GITHUB_TOKEN}' -H 'Accept: application/vnd.github.v4.raw' -L https://api.github.com/repos/stolostron/build-harness-extensions/contents/templates/Makefile.build-harness-bootstrap -o .build-harness-bootstrap; echo .build-harness-bootstrap)
endif
else
-include vbh/.build-harness-vendorized
Expand Down
26 changes: 23 additions & 3 deletions Makefile.prow
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,14 @@ CLEANXARGS = xargs ${XARGS_FLAGS}
IMG ?= $(shell cat COMPONENT_NAME 2> /dev/null)
export GOPACKAGES = $(shell go list ./... | grep -v /manager | grep -v /bindata | grep -v /vendor | grep -v /internal | grep -v /build | grep -v /test )

TEST_TMP :=/tmp
export KUBEBUILDER_ASSETS ?=$(TEST_TMP)/kubebuilder/bin
K8S_VERSION ?=1.19.2
GOHOSTOS ?=$(shell go env GOHOSTOS)
GOHOSTARCH ?= $(shell go env GOHOSTARCH)
KB_TOOLS_ARCHIVE_NAME :=kubebuilder-tools-$(K8S_VERSION)-$(GOHOSTOS)-$(GOHOSTARCH).tar.gz
KB_TOOLS_ARCHIVE_PATH := $(TEST_TMP)/$(KB_TOOLS_ARCHIVE_NAME)

.PHONY: build

-include /opt/build-harness/Makefile.prow
Expand Down Expand Up @@ -57,8 +65,20 @@ lint-yaml:
lint-go:
@${FINDFILES} -name '*.go' \( ! \( -name '*.gen.go' -o -name '*.pb.go' \) \) -print0 | ${XARGS} common/scripts/lint_go.sh

.PHONY: ensure-kubebuilder-tools

# download the kubebuilder-tools to get kube-apiserver binaries from it
ensure-kubebuilder-tools:
ifeq "" "$(wildcard $(KUBEBUILDER_ASSETS))"
$(info Downloading kube-apiserver into '$(KUBEBUILDER_ASSETS)')
mkdir -p '$(KUBEBUILDER_ASSETS)'
curl -s -f -L https://storage.googleapis.com/kubebuilder-tools/$(KB_TOOLS_ARCHIVE_NAME) -o '$(KB_TOOLS_ARCHIVE_PATH)'
tar -C '$(KUBEBUILDER_ASSETS)' --strip-components=2 -zvxf '$(KB_TOOLS_ARCHIVE_PATH)'
else
$(info Using existing kube-apiserver from "$(KUBEBUILDER_ASSETS)")
endif

.PHONY: test

test:
@build/setup-tests.sh
@build/run-unit-tests.sh
test: ensure-kubebuilder-tools
go test -timeout 300s -v ./pkg/...
19 changes: 9 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# multicloud-operators-placementrule

[![Build](https://api.travis-ci.com/open-cluster-management/multicloud-operators-placementrule.svg?branch=main)](https://api.travis-ci.com/open-cluster-management/multicloud-operators-placementrule.svg?branch=main)
[![GoDoc](https://godoc.org/github.com/open-cluster-management/multicloud-operators-placementrule?status.svg)](https://godoc.org/github.com/open-cluster-management/multicloud-operators-placementrule)
[![Go Report Card](https://goreportcard.com/badge/github.com/open-cluster-management/multicloud-operators-placementrule)](https://goreportcard.com/report/github.com/open-cluster-management/multicloud-operators-placementrule)
[![Build](https://api.travis-ci.com/stolostron/multicloud-operators-placementrule.svg?branch=main)](https://api.travis-ci.com/stolostron/multicloud-operators-placementrule.svg?branch=main)
[![GoDoc](https://godoc.org/github.com/stolostron/multicloud-operators-placementrule?status.svg)](https://godoc.org/github.com/stolostron/multicloud-operators-placementrule)
[![Go Report Card](https://goreportcard.com/badge/github.com/stolostron/multicloud-operators-placementrule)](https://goreportcard.com/report/github.com/stolostron/multicloud-operators-placementrule)
[![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=open-cluster-management_multicloud-operators-placementrule&metric=coverage)](https://sonarcloud.io/api/project_badges/measure?project=open-cluster-management_multicloud-operators-placementrule&metric=coverage)
[![License](https://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)

Expand Down Expand Up @@ -52,10 +52,9 @@ Check the [Security Doc](SECURITY.md) if you've found a security issue.

### multicloud-operators repositories

- [multicloud-operators-application](https://github.com/open-cluster-management/multicloud-operators-application)
- [multicloud-operators-channel](https://github.com/open-cluster-management/multicloud-operators-channel)
- [multicloud-operators-deployable](https://github.com/open-cluster-management/multicloud-operators-deployable)
- [multicloud-operators-placementrule](https://github.com/open-cluster-management/multicloud-operators-placementrule)
- [multicloud-operators-subscription](https://github.com/open-cluster-management/multicloud-operators-subscription)
- [multicloud-operators-subscription-release](https://github.com/open-cluster-management/multicloud-operators-subscription-release)

- [multicloud-operators-application](https://github.com/stolostron/multicloud-operators-application)
- [multicloud-operators-channel](https://github.com/stolostron/multicloud-operators-channel)
- [multicloud-operators-deployable](https://github.com/stolostron/multicloud-operators-deployable)
- [multicloud-operators-placementrule](https://github.com/stolostron/multicloud-operators-placementrule)
- [multicloud-operators-subscription](https://github.com/stolostron/multicloud-operators-subscription)
- [multicloud-operators-subscription-release](https://github.com/stolostron/multicloud-operators-subscription-release)
8 changes: 4 additions & 4 deletions build/Dockerfile.prow
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM registry.ci.openshift.org/open-cluster-management/builder:go1.17-linux AS builder
FROM registry.ci.openshift.org/stolostron/builder:go1.17-linux AS builder

WORKDIR /go/src/github.com/open-cluster-management/multicluster-operators-placementrule
WORKDIR /go/src/github.com/stolostron/multicluster-operators-placementrule
COPY . .
RUN make -f Makefile.prow build

Expand All @@ -14,8 +14,8 @@ ENV OPERATOR=/usr/local/bin/multicluster-operators-placementrule \
USER_NAME=multicluster-operators-placementrule

# install operator binary
COPY --from=builder /go/src/github.com/open-cluster-management/multicluster-operators-placementrule/build/_output/bin/multicluster-operators-placementrule ${OPERATOR}
COPY --from=builder /go/src/github.com/open-cluster-management/multicluster-operators-placementrule/build/_output/bin/gitopscluster /usr/local/bin/gitopscluster
COPY --from=builder /go/src/github.com/stolostron/multicluster-operators-placementrule/build/_output/bin/multicluster-operators-placementrule ${OPERATOR}
COPY --from=builder /go/src/github.com/stolostron/multicluster-operators-placementrule/build/_output/bin/gitopscluster /usr/local/bin/gitopscluster

COPY build/bin /usr/local/bin
RUN /usr/local/bin/user_setup
Expand Down
6 changes: 3 additions & 3 deletions cmd/gitopscluster/exec/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"github.com/IBM/controller-filtered-cache/filteredcache"
clusterv1alpha1 "github.com/open-cluster-management/api/cluster/v1alpha1"
endpointapis "github.com/open-cluster-management/klusterlet-addon-controller/pkg/apis"
"github.com/open-cluster-management/multicloud-operators-placementrule/pkg/apis"
"github.com/open-cluster-management/multicloud-operators-placementrule/pkg/controller"
"github.com/open-cluster-management/multicloud-operators-placementrule/pkg/utils"
"github.com/stolostron/multicloud-operators-placementrule/pkg/apis"
"github.com/stolostron/multicloud-operators-placementrule/pkg/controller"
"github.com/stolostron/multicloud-operators-placementrule/pkg/utils"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime/schema"

Expand Down
2 changes: 1 addition & 1 deletion cmd/gitopscluster/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (

"k8s.io/klog"

"github.com/open-cluster-management/multicloud-operators-placementrule/cmd/gitopscluster/exec"
"github.com/stolostron/multicloud-operators-placementrule/cmd/gitopscluster/exec"
)

func main() {
Expand Down
6 changes: 3 additions & 3 deletions cmd/manager/exec/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import (
"fmt"
"os"

"github.com/open-cluster-management/multicloud-operators-placementrule/pkg/apis"
"github.com/open-cluster-management/multicloud-operators-placementrule/pkg/controller"
"github.com/open-cluster-management/multicloud-operators-placementrule/pkg/utils"
"github.com/stolostron/multicloud-operators-placementrule/pkg/apis"
"github.com/stolostron/multicloud-operators-placementrule/pkg/controller"
"github.com/stolostron/multicloud-operators-placementrule/pkg/utils"

"k8s.io/client-go/rest"
"k8s.io/klog"
Expand Down
2 changes: 1 addition & 1 deletion cmd/manager/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (

"k8s.io/klog"

"github.com/open-cluster-management/multicloud-operators-placementrule/cmd/manager/exec"
"github.com/stolostron/multicloud-operators-placementrule/cmd/manager/exec"
)

func main() {
Expand Down
4 changes: 3 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/open-cluster-management/multicloud-operators-placementrule
module github.com/stolostron/multicloud-operators-placementrule

go 1.17

Expand Down Expand Up @@ -79,6 +79,8 @@ require (
)

replace (
github.com/open-cluster-management/api => open-cluster-management.io/api v0.0.0-20210513122330-d76f10481f05
github.com/open-cluster-management/klusterlet-addon-controller => github.com/stolostron/klusterlet-addon-controller v0.0.0-20210303215539-1d12cebe6f19
k8s.io/api => k8s.io/api v0.19.3
k8s.io/client-go => k8s.io/client-go v0.19.3
)
10 changes: 4 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -339,11 +339,6 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J
github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE=
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
github.com/open-cluster-management/api v0.0.0-20200903203421-64b667f5455c/go.mod h1:F1hDJHtWuV7BAUtfL4XRS9GZjUpksleLgEcisNXvQEw=
github.com/open-cluster-management/api v0.0.0-20210513122330-d76f10481f05 h1:djYyfpgsbRg/GUizlPHaemlmkS77N+ZCB9HmJGLpFVw=
github.com/open-cluster-management/api v0.0.0-20210513122330-d76f10481f05/go.mod h1:ot+A1DWq+v1IV+e1S7nhIteYAmNByFgtazvzpoeAfRQ=
github.com/open-cluster-management/klusterlet-addon-controller v0.0.0-20210303215539-1d12cebe6f19 h1:qWTC5iBoxrId/AKYdTcU9wGIx1CRwXqdnD4VppDBVpQ=
github.com/open-cluster-management/klusterlet-addon-controller v0.0.0-20210303215539-1d12cebe6f19/go.mod h1:YWcjLe+zqmdqPFvwzASizCa8JdXe5briBgxoP+r3CRM=
github.com/open-cluster-management/library-e2e-go v0.0.0-20200620112055-c80fc3c14997/go.mod h1:glvUOJg5EAb1Lq0OPcYhl57PJTxN2T5xuSfdV3Iab4Y=
github.com/open-cluster-management/library-go v0.0.0-20200828173847-299c21e6c3fc/go.mod h1:X9KdKajEnrx6+LQSjo+61gLdk4Ntmwp+YEYD0CIJT7I=
github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
Expand Down Expand Up @@ -408,6 +403,8 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
github.com/stolostron/klusterlet-addon-controller v0.0.0-20210303215539-1d12cebe6f19 h1:hftm4DM0u/igwO7DEydPFoXaSY6Dly3e51EFAKgb3tE=
github.com/stolostron/klusterlet-addon-controller v0.0.0-20210303215539-1d12cebe6f19/go.mod h1:YWcjLe+zqmdqPFvwzASizCa8JdXe5briBgxoP+r3CRM=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
Expand Down Expand Up @@ -729,7 +726,6 @@ k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
k8s.io/klog/v2 v2.3.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=
k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E=
Expand All @@ -743,6 +739,8 @@ k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl
k8s.io/utils v0.0.0-20200603063816-c1c6865ac451/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
k8s.io/utils v0.0.0-20200729134348-d5654de09c73 h1:uJmqzgNWG7XyClnU/mLPBWwfKKF1K8Hf8whTseBgJcg=
k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
open-cluster-management.io/api v0.0.0-20210513122330-d76f10481f05 h1:aO4XnDCD3/N/JLaiCMfdEMQR8Zlmvtw4d5fx7YHZUGM=
open-cluster-management.io/api v0.0.0-20210513122330-d76f10481f05/go.mod h1:ot+A1DWq+v1IV+e1S7nhIteYAmNByFgtazvzpoeAfRQ=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod h1:PHgbrJT7lCHcxMU+mDHEm+nx46H4zuuHZkDP6icnhu0=
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.9/go.mod h1:dzAXnQbTRyDlZPJX2SUPEqvnB+j7AJjtlox7PEwigU0=
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/addtoscheme_apps_v1.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

package apis

import v1 "github.com/open-cluster-management/multicloud-operators-placementrule/pkg/apis/apps/v1"
import v1 "github.com/stolostron/multicloud-operators-placementrule/pkg/apis/apps/v1"

func init() {
// Register the types with the Scheme so the components can map objects to GroupVersionKinds and back
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/addtoscheme_apps_v1alpha1.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

package apis

import v1alpha1 "github.com/open-cluster-management/multicloud-operators-placementrule/pkg/apis/apps/v1alpha1"
import v1alpha1 "github.com/stolostron/multicloud-operators-placementrule/pkg/apis/apps/v1alpha1"

func init() {
// Register the types with the Scheme so the components can map objects to GroupVersionKinds and back
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/add_gitopscluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

package controller

import "github.com/open-cluster-management/multicloud-operators-placementrule/pkg/controller/gitopscluster"
import "github.com/stolostron/multicloud-operators-placementrule/pkg/controller/gitopscluster"

func init() {
// AddToManagerFuncs is a list of functions to create controllers and add them to a manager.
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/add_placementrule.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package controller

import (
"github.com/open-cluster-management/multicloud-operators-placementrule/pkg/controller/placementrule"
"github.com/stolostron/multicloud-operators-placementrule/pkg/controller/placementrule"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/gitopscluster/gitopscluster_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import (
spokeClusterV1 "github.com/open-cluster-management/api/cluster/v1"
clusterv1alpha1 "github.com/open-cluster-management/api/cluster/v1alpha1"
agentv1 "github.com/open-cluster-management/klusterlet-addon-controller/pkg/apis/agent/v1"
gitopsclusterV1alpha1 "github.com/open-cluster-management/multicloud-operators-placementrule/pkg/apis/apps/v1alpha1"
"github.com/open-cluster-management/multicloud-operators-placementrule/pkg/utils"
gitopsclusterV1alpha1 "github.com/stolostron/multicloud-operators-placementrule/pkg/apis/apps/v1alpha1"
"github.com/stolostron/multicloud-operators-placementrule/pkg/utils"
v1 "k8s.io/api/core/v1"
"k8s.io/client-go/kubernetes"
"k8s.io/klog"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
spokeClusterV1 "github.com/open-cluster-management/api/cluster/v1"
clusterv1alpha1 "github.com/open-cluster-management/api/cluster/v1alpha1"
endpointapis "github.com/open-cluster-management/klusterlet-addon-controller/pkg/apis"
gitopsclusterV1alpha1 "github.com/open-cluster-management/multicloud-operators-placementrule/pkg/apis/apps/v1alpha1"
gitopsclusterV1alpha1 "github.com/stolostron/multicloud-operators-placementrule/pkg/apis/apps/v1alpha1"
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/rest"
"sigs.k8s.io/controller-runtime/pkg/envtest"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

"github.com/onsi/gomega"
clusterv1alpha1 "github.com/open-cluster-management/api/cluster/v1alpha1"
gitopsclusterV1alpha1 "github.com/open-cluster-management/multicloud-operators-placementrule/pkg/apis/apps/v1alpha1"
gitopsclusterV1alpha1 "github.com/stolostron/multicloud-operators-placementrule/pkg/apis/apps/v1alpha1"
corev1 "k8s.io/api/core/v1"
rbacv1 "k8s.io/api/rbac/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/placementrule/placement.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"k8s.io/klog"

spokeClusterV1 "github.com/open-cluster-management/api/cluster/v1"
appv1alpha1 "github.com/open-cluster-management/multicloud-operators-placementrule/pkg/apis/apps/v1"
"github.com/open-cluster-management/multicloud-operators-placementrule/pkg/utils"
appv1alpha1 "github.com/stolostron/multicloud-operators-placementrule/pkg/apis/apps/v1"
"github.com/stolostron/multicloud-operators-placementrule/pkg/utils"
rbacv1 "k8s.io/api/authorization/v1"
"k8s.io/apimachinery/pkg/api/resource"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/placementrule/placementrule_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"context"

spokeClusterV1 "github.com/open-cluster-management/api/cluster/v1"
appv1alpha1 "github.com/open-cluster-management/multicloud-operators-placementrule/pkg/apis/apps/v1"
"github.com/open-cluster-management/multicloud-operators-placementrule/pkg/utils"
appv1alpha1 "github.com/stolostron/multicloud-operators-placementrule/pkg/apis/apps/v1"
"github.com/stolostron/multicloud-operators-placementrule/pkg/utils"

"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

"github.com/open-cluster-management/multicloud-operators-placementrule/pkg/apis"
"github.com/stolostron/multicloud-operators-placementrule/pkg/apis"
)

var cfg *rest.Config
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

appv1alpha1 "github.com/open-cluster-management/multicloud-operators-placementrule/pkg/apis/apps/v1"
appv1alpha1 "github.com/stolostron/multicloud-operators-placementrule/pkg/apis/apps/v1"
)

var c client.Client
Expand Down
2 changes: 1 addition & 1 deletion pkg/utils/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"strings"

spokeClusterV1 "github.com/open-cluster-management/api/cluster/v1"
appv1 "github.com/open-cluster-management/multicloud-operators-placementrule/pkg/apis/apps/v1"
appv1 "github.com/stolostron/multicloud-operators-placementrule/pkg/apis/apps/v1"
rbacv1 "k8s.io/api/authorization/v1"
"k8s.io/apimachinery/pkg/api/meta"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/utils/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (

spokeClusterV1 "github.com/open-cluster-management/api/cluster/v1"
clusterv1alpha1 "github.com/open-cluster-management/api/cluster/v1alpha1"
gitopsclusterV1alpha1 "github.com/open-cluster-management/multicloud-operators-placementrule/pkg/apis/apps/v1alpha1"
gitopsclusterV1alpha1 "github.com/stolostron/multicloud-operators-placementrule/pkg/apis/apps/v1alpha1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/event"
"sigs.k8s.io/controller-runtime/pkg/predicate"
Expand Down
Loading

0 comments on commit 6d97a1d

Please sign in to comment.