Skip to content

Commit

Permalink
Update pkg references to open-cluster-management.io (#22)
Browse files Browse the repository at this point in the history
Signed-off-by: Dale Haiducek <dhaiduce@redhat.com>
  • Loading branch information
dhaiducek committed Dec 20, 2021
1 parent 0a088fc commit e08b41e
Show file tree
Hide file tree
Showing 31 changed files with 445 additions and 134 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ e2e-debug:
# e2e test coverage
############################################################
build-instrumented:
go test -covermode=atomic -coverpkg=github.com/open-cluster-management/$(IMG)... -c -tags e2e ./cmd/manager -o build/_output/bin/$(IMG)-instrumented
go test -covermode=atomic -coverpkg=open-cluster-management.io/$(IMG)... -c -tags e2e ./cmd/manager -o build/_output/bin/$(IMG)-instrumented

run-instrumented:
WATCH_NAMESPACE="$(WATCH_NAMESPACE)" ./build/_output/bin/$(IMG)-instrumented -test.run "^TestRunMain$$" -test.coverprofile=coverage_e2e.out &>/dev/null &
Expand Down
4 changes: 2 additions & 2 deletions PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins:
manifests.sdk.operatorframework.io/v2: {}
scorecard.sdk.operatorframework.io/v2: {}
projectName: config-policy-controller
repo: github.com/open-cluster-management/config-policy-controller
repo: open-cluster-management.io/config-policy-controller
resources:
- api:
crdVersion: v1
Expand All @@ -14,6 +14,6 @@ resources:
domain: open-cluster-management.io
group: policy
kind: ConfigurationPolicy
path: github.com/open-cluster-management/config-policy-controller/api/v1
path: open-cluster-management.io/config-policy-controller/api/v1
version: v1
version: "3"
2 changes: 1 addition & 1 deletion build/common/Makefile.common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,6 @@ lint-markdown:
lint-all: lint-yaml lint-go

format-go:
@${FINDFILES} -name '*.go' \( ! \( -name '*.gen.go' -o -name '*.pb.go' \) \) -print0 | ${XARGS} goimports -w -local "github.com/open-cluster-management"
@${FINDFILES} -name '*.go' \( ! \( -name '*.gen.go' -o -name '*.pb.go' \) \) -print0 | ${XARGS} goimports -w -local "open-cluster-management.io"

.PHONY: lint-dockerfiles lint-scripts lint-yaml lint-copyright-banner lint-go lint-markdown lint-all format-go config-docker
2 changes: 1 addition & 1 deletion build/common/config/.golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ linters-settings:
# report about shadowed variables
check-shadowing: false
gci:
local-prefixes: github.com/open-cluster-management/config-policy-controller
local-prefixes: open-cluster-management.io/config-policy-controller
golint:
# minimal confidence for issues, default is 0.8
min-confidence: 0.0
Expand Down
6 changes: 3 additions & 3 deletions controllers/configurationpolicy_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import (

gocmp "github.com/google/go-cmp/cmp"
templates "github.com/open-cluster-management/go-template-utils/pkg/templates"
extpoliciesv1 "github.com/open-cluster-management/governance-policy-propagator/api/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
meta "k8s.io/apimachinery/pkg/api/meta"
Expand All @@ -30,12 +29,13 @@ import (
"k8s.io/client-go/rest"
"k8s.io/client-go/restmapper"
"k8s.io/client-go/tools/record"
extpoliciesv1 "open-cluster-management.io/governance-policy-propagator/api/v1"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

policyv1 "github.com/open-cluster-management/config-policy-controller/api/v1"
common "github.com/open-cluster-management/config-policy-controller/pkg/common"
policyv1 "open-cluster-management.io/config-policy-controller/api/v1"
common "open-cluster-management.io/config-policy-controller/pkg/common"
)

const ControllerName string = "configuration-policy-controller"
Expand Down
2 changes: 1 addition & 1 deletion controllers/configurationpolicy_controller_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"k8s.io/client-go/kubernetes/scheme"
"sigs.k8s.io/controller-runtime/pkg/envtest"

policiesv1alpha1 "github.com/open-cluster-management/config-policy-controller/api/v1"
policiesv1alpha1 "open-cluster-management.io/config-policy-controller/api/v1"
)

var samplePolicy = policiesv1alpha1.ConfigurationPolicy{
Expand Down
4 changes: 2 additions & 2 deletions controllers/configurationpolicy_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client/fake"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

policiesv1alpha1 "github.com/open-cluster-management/config-policy-controller/api/v1"
"github.com/open-cluster-management/config-policy-controller/pkg/common"
policiesv1alpha1 "open-cluster-management.io/config-policy-controller/api/v1"
"open-cluster-management.io/config-policy-controller/pkg/common"
)

func TestReconcile(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion controllers/configurationpolicy_utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"

policyv1 "github.com/open-cluster-management/config-policy-controller/api/v1"
policyv1 "open-cluster-management.io/config-policy-controller/api/v1"
)

// addRelatedObjects builds the list of kubernetes resources related to the policy. The list contains
Expand Down
2 changes: 1 addition & 1 deletion controllers/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"

policyv1 "github.com/open-cluster-management/config-policy-controller/api/v1"
policyv1 "open-cluster-management.io/config-policy-controller/api/v1"
)

// These tests use Ginkgo (BDD-style Go testing framework). Refer to
Expand Down
14 changes: 7 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
module github.com/open-cluster-management/config-policy-controller
module open-cluster-management.io/config-policy-controller

go 1.17

require (
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
github.com/google/go-cmp v0.5.5
github.com/google/go-cmp v0.5.6
github.com/onsi/ginkgo v1.16.4
github.com/onsi/gomega v1.13.0
github.com/open-cluster-management/addon-framework v0.0.0-20210621074027-a81f712c10c2
github.com/open-cluster-management/go-template-utils v1.3.0
github.com/open-cluster-management/governance-policy-propagator v0.0.0-20211012174109-95c3b77cce09
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.7.0
k8s.io/api v0.21.3
k8s.io/apimachinery v0.21.3
k8s.io/client-go v12.0.0+incompatible
k8s.io/klog v1.0.0
open-cluster-management.io/addon-framework v0.0.0-20210624140015-b26f9964526c
open-cluster-management.io/governance-policy-propagator v0.5.1-0.20211220161230-0e35d5833c52
sigs.k8s.io/controller-runtime v0.9.2
)

Expand All @@ -32,7 +32,7 @@ require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
github.com/emicklei/go-restful v2.11.1+incompatible // indirect
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
github.com/form3tech-oss/jwt-go v3.2.2+incompatible // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
Expand All @@ -57,7 +57,6 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/open-cluster-management/multicloud-operators-placementrule v1.2.4-0-20210816-699e5 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.11.0 // indirect
Expand All @@ -68,7 +67,7 @@ require (
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.17.0 // indirect
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b // indirect
golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 // indirect
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40 // indirect
Expand All @@ -87,6 +86,7 @@ require (
k8s.io/klog/v2 v2.8.0 // indirect
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 // indirect
k8s.io/utils v0.0.0-20210527160623-6fdb442a123b // indirect
open-cluster-management.io/multicloud-operators-subscription v0.5.0 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
)
Expand Down
Loading

0 comments on commit e08b41e

Please sign in to comment.