Skip to content

Commit

Permalink
rename org name to stolostron in 2.4 branch (#44)
Browse files Browse the repository at this point in the history
Signed-off-by: xuezhaojun <zxue@redhat.com>
  • Loading branch information
xuezhaojun committed Jan 18, 2022
1 parent cbc2815 commit 2480056
Show file tree
Hide file tree
Showing 103 changed files with 4,364 additions and 3,427 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Expand Up @@ -36,7 +36,7 @@ contribution. See the [DCO](DCO) file for details.

Anyone may comment on issues and submit reviews for pull requests. However, in
order to be assigned an issue or pull request, you must be a member of the
[open-cluster-management](https://github.com/open-cluster-management) GitHub organization.
[stolostron](https://github.com/stolostron) GitHub organization.

Repo maintainers can assign you an issue or pull request by leaving a
`/assign <your Github ID>` comment on the issue or pull request.
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile
@@ -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/cluster-proxy-addon
WORKDIR /go/src/github.com/stolostron/cluster-proxy-addon

COPY . .

Expand All @@ -11,9 +11,9 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal:latest

ENV USER_UID=10001

COPY --from=builder /go/src/github.com/open-cluster-management/cluster-proxy-addon/cluster-proxy /
COPY --from=builder /go/src/github.com/open-cluster-management/cluster-proxy-addon/proxy-agent /
COPY --from=builder /go/src/github.com/open-cluster-management/cluster-proxy-addon/proxy-server /
COPY --from=builder /go/src/github.com/stolostron/cluster-proxy-addon/cluster-proxy /
COPY --from=builder /go/src/github.com/stolostron/cluster-proxy-addon/proxy-agent /
COPY --from=builder /go/src/github.com/stolostron/cluster-proxy-addon/proxy-server /

RUN microdnf update && microdnf clean all

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -14,7 +14,7 @@ include $(addprefix ./vendor/github.com/openshift/build-machinery-go/make/, \

# Image URL to use all building/pushing image targets;
IMAGE ?= cluster-proxy-addon
IMAGE_REGISTRY ?= quay.io/open-cluster-management
IMAGE_REGISTRY ?= quay.io/stolostron

# ANP source code
ANP_NAME ?= apiserver-network-proxy
Expand Down
8 changes: 4 additions & 4 deletions cmd/cluster-proxy/main.go
Expand Up @@ -10,14 +10,14 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"

"github.com/open-cluster-management/cluster-proxy-addon/pkg/cmd/configchecker"
"github.com/open-cluster-management/cluster-proxy-addon/pkg/cmd/hub"
"github.com/open-cluster-management/cluster-proxy-addon/pkg/cmd/spoke"
"github.com/stolostron/cluster-proxy-addon/pkg/cmd/configchecker"
"github.com/stolostron/cluster-proxy-addon/pkg/cmd/hub"
"github.com/stolostron/cluster-proxy-addon/pkg/cmd/spoke"

utilflag "k8s.io/component-base/cli/flag"
"k8s.io/component-base/logs"

"github.com/open-cluster-management/cluster-proxy-addon/pkg/version"
"github.com/stolostron/cluster-proxy-addon/pkg/version"
)

func main() {
Expand Down
1 change: 1 addition & 0 deletions dependencymagnet/doc.go
@@ -1,3 +1,4 @@
//go:build tools
// +build tools

// go mod won't pull in code that isn't depended upon, but we have some code we don't depend on from code that must be included
Expand Down
16 changes: 8 additions & 8 deletions go.mod
@@ -1,4 +1,4 @@
module github.com/open-cluster-management/cluster-proxy-addon
module github.com/stolostron/cluster-proxy-addon

go 1.17

Expand All @@ -7,11 +7,11 @@ require (
github.com/go-bindata/go-bindata v3.1.2+incompatible
github.com/onsi/ginkgo v1.16.4
github.com/onsi/gomega v1.16.0
github.com/open-cluster-management/multicloud-operators-foundation v1.0.0-2021-09-15-06-57-52
github.com/openshift/build-machinery-go v0.0.0-20210806203541-4ea9b6da3a37
github.com/openshift/library-go v0.0.0-20210916194400-ae21aab32431
github.com/spf13/cobra v1.1.3
github.com/spf13/pflag v1.0.5
github.com/stolostron/multicloud-operators-foundation v1.0.0-2021-10-26-20-16-14.0.20220110023249-172fb944faa9
k8s.io/api v0.22.1
k8s.io/apimachinery v0.22.1
k8s.io/client-go v12.0.0+incompatible
Expand Down Expand Up @@ -71,6 +71,7 @@ require (
github.com/prometheus/procfs v0.6.0 // indirect
github.com/robfig/cron v1.2.0 // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/spf13/afero v1.3.5 // indirect
github.com/weppos/publicsuffix-go v0.13.0 // indirect
github.com/zmap/zcrypto v0.0.0-20201128221613-3719af1573cf // indirect
github.com/zmap/zlint/v3 v3.0.0 // indirect
Expand All @@ -90,12 +91,12 @@ require (
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.17.0 // indirect
go.uber.org/zap v1.19.0 // indirect
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect
golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 // indirect
golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 // indirect
golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 // indirect
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
golang.org/x/text v0.3.6 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
Expand All @@ -111,10 +112,10 @@ require (
k8s.io/apiextensions-apiserver v0.22.1 // indirect
k8s.io/apiserver v0.22.1 // indirect
k8s.io/kube-aggregator v0.22.1 // indirect
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect
k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9 // indirect
k8s.io/kube-openapi v0.0.0-20210929172449-94abcedd1aa4 // indirect
k8s.io/utils v0.0.0-20210802155522-efc7438f0176 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22 // indirect
sigs.k8s.io/controller-runtime v0.9.3-0.20210709165254-650ea59f19cc // indirect
sigs.k8s.io/controller-runtime v0.9.7 // indirect
sigs.k8s.io/kube-storage-version-migrator v0.0.4 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
Expand All @@ -124,7 +125,6 @@ replace github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.1 //

replace k8s.io/apiserver => k8s.io/apiserver v0.22.1

// required by multicloud-operators-foundation
replace (
github.com/kubevirt/terraform-provider-kubevirt => github.com/nirarg/terraform-provider-kubevirt v0.0.0-20201222125919-101cee051ed3
github.com/metal3-io/baremetal-operator => github.com/openshift/baremetal-operator v0.0.0-20200715132148-0f91f62a41fe
Expand Down

0 comments on commit 2480056

Please sign in to comment.