diff --git a/Dockerfile b/Dockerfile index 68abccdf70..5040071264 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,12 @@ FROM registry.svc.ci.openshift.org/openshift/release:golang-1.10 AS builder -WORKDIR /go/src/github.com/openshift/cluster-osin-operator +WORKDIR /go/src/github.com/openshift/cluster-authentication-operator COPY . . -RUN go build -o osin-operator ./cmd/osin-operator +RUN go build -o authentication-operator ./cmd/authentication-operator FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base -COPY --from=builder /go/src/github.com/openshift/cluster-osin-operator/osin-operator /usr/bin/ +COPY --from=builder /go/src/github.com/openshift/cluster-authentication-operator/authentication-operator /usr/bin/ COPY manifests /manifests -ENTRYPOINT ["/usr/bin/osin-operator"] +ENTRYPOINT ["/usr/bin/authentication-operator"] LABEL io.k8s.display-name="OpenShift cluster-authentication-operator" \ io.k8s.description="This is a component of OpenShift and manages cluster authentication settings" \ com.redhat.component="cluster-authentication-operator" \ diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7 index 285930f78e..1bc68955da 100644 --- a/Dockerfile.rhel7 +++ b/Dockerfile.rhel7 @@ -1,12 +1,12 @@ FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder -WORKDIR /go/src/github.com/openshift/cluster-osin-operator +WORKDIR /go/src/github.com/openshift/cluster-authentication-operator COPY . . -RUN go build -o osin-operator ./cmd/osin-operator +RUN go build -o authentication-operator ./cmd/authentication-operator FROM registry.svc.ci.openshift.org/ocp/4.0:base -COPY --from=builder /go/src/github.com/openshift/cluster-osin-operator/osin-operator /usr/bin/ +COPY --from=builder /go/src/github.com/openshift/cluster-authentication-operator/authentication-operator /usr/bin/ COPY manifests /manifests -ENTRYPOINT ["/usr/bin/osin-operator"] +ENTRYPOINT ["/usr/bin/authentication-operator"] LABEL io.k8s.display-name="OpenShift cluster-authentication-operator" \ io.k8s.description="This is a component of OpenShift and manages cluster authentication settings" \ com.redhat.component="cluster-authentication-operator" \ diff --git a/cmd/osin-operator/main.go b/cmd/authentication-operator/main.go similarity index 77% rename from cmd/osin-operator/main.go rename to cmd/authentication-operator/main.go index 3922ffc284..e1c2aecbb8 100644 --- a/cmd/osin-operator/main.go +++ b/cmd/authentication-operator/main.go @@ -13,8 +13,8 @@ import ( utilflag "k8s.io/apiserver/pkg/util/flag" "k8s.io/apiserver/pkg/util/logs" - "github.com/openshift/cluster-osin-operator/pkg/cmd/operator" - "github.com/openshift/cluster-osin-operator/pkg/cmd/operator2" + "github.com/openshift/cluster-authentication-operator/pkg/cmd/operator" + "github.com/openshift/cluster-authentication-operator/pkg/cmd/operator2" ) func main() { @@ -35,8 +35,8 @@ func main() { func NewAuthenticationOperatorCommand() *cobra.Command { cmd := &cobra.Command{ - Use: "osin-operator", - Short: "OpenShift osin OAuth server operator", + Use: "authentication-operator", + Short: "OpenShift authentication OAuth server operator", Run: func(cmd *cobra.Command, args []string) { cmd.Help() os.Exit(1) diff --git a/glide.yaml b/glide.yaml index 2292b79399..110ae01c30 100644 --- a/glide.yaml +++ b/glide.yaml @@ -1,4 +1,4 @@ -package: github.com/openshift/cluster-osin-operator +package: github.com/openshift/cluster-authentication-operator import: - package: k8s.io/apimachinery version: kubernetes-1.11.1 diff --git a/hack/lib/constants.sh b/hack/lib/constants.sh index c4787b202f..35c3201a0f 100755 --- a/hack/lib/constants.sh +++ b/hack/lib/constants.sh @@ -2,7 +2,7 @@ # This script provides constants for the Golang binary build process -readonly OS_GO_PACKAGE=github.com/openshift/cluster-osin-operator +readonly OS_GO_PACKAGE=github.com/openshift/cluster-authentication-operator readonly OS_BUILD_ENV_GOLANG="${OS_BUILD_ENV_GOLANG:-1.9}" readonly OS_BUILD_ENV_IMAGE="${OS_BUILD_ENV_IMAGE:-openshift/origin-release:golang-${OS_BUILD_ENV_GOLANG}}" @@ -25,7 +25,7 @@ readonly OS_GOFLAGS_TAGS="include_gcs include_oss containers_image_openpgp" readonly OS_IMAGE_COMPILE_BINARIES=( ) readonly OS_CROSS_COMPILE_TARGETS=( - cmd/osin-operator + cmd/authentication-operator ) readonly OS_CROSS_COMPILE_BINARIES=("${OS_CROSS_COMPILE_TARGETS[@]##*/}") @@ -146,5 +146,5 @@ readonly OS_ALL_IMAGES=( # os::build::images builds all images in this repo. function os::build::images() { tag_prefix="${OS_IMAGE_PREFIX:-"openshift/origin"}" - os::build::image "${tag_prefix}-cluster-osin-operator" . + os::build::image "${tag_prefix}-cluster-authentication-operator" . } diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index a07b6c028f..ec9cb676a0 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -29,7 +29,7 @@ verify="${VERIFY:-}" # k8s.io/kubernetes. The output-base is needed for the generators to output into the vendor dir # instead of the $GOPATH directly. For normal projects this can be dropped. ${CODEGEN_PKG}/generate-groups.sh "all" \ - github.com/openshift/cluster-osin-operator/pkg/generated github.com/openshift/cluster-osin-operator/pkg/apis \ + github.com/openshift/cluster-authentication-operator/pkg/generated github.com/openshift/cluster-authentication-operator/pkg/apis \ authentication:v1alpha1 \ --output-base "$(dirname ${BASH_SOURCE})/../../../.." \ --go-header-file ${SCRIPT_ROOT}/hack/boilerplate.txt \ diff --git a/manifests/0000_09_cluster-osin-operator_00_roles.yaml b/manifests/0000_09_cluster-authentication-operator_00_roles.yaml similarity index 56% rename from manifests/0000_09_cluster-osin-operator_00_roles.yaml rename to manifests/0000_09_cluster-authentication-operator_00_roles.yaml index dc0c195ac1..319bf94703 100644 --- a/manifests/0000_09_cluster-osin-operator_00_roles.yaml +++ b/manifests/0000_09_cluster-authentication-operator_00_roles.yaml @@ -1,11 +1,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: system:openshift:operator:osin + name: system:openshift:operator:authentication roleRef: kind: ClusterRole name: cluster-admin # TODO fix, this is madness subjects: - kind: ServiceAccount - namespace: openshift-core-operators - name: origin-cluster-osin-operator + namespace: openshift-authentication-operator + name: origin-cluster-authentication-operator diff --git a/manifests/0000_09_cluster-osin-operator_01_namespace.yaml b/manifests/0000_09_cluster-authentication-operator_01_namespace.yaml similarity index 69% rename from manifests/0000_09_cluster-osin-operator_01_namespace.yaml rename to manifests/0000_09_cluster-authentication-operator_01_namespace.yaml index 1563f5ca64..0fe9af4523 100644 --- a/manifests/0000_09_cluster-osin-operator_01_namespace.yaml +++ b/manifests/0000_09_cluster-authentication-operator_01_namespace.yaml @@ -3,11 +3,11 @@ kind: Namespace metadata: labels: openshift.io/run-level: "1" - name: openshift-core-operators + name: openshift-authentication-operator --- apiVersion: v1 kind: Namespace metadata: labels: openshift.io/run-level: "9" - name: openshift-osin + name: openshift-authentication diff --git a/manifests/0000_09_cluster-osin-operator_02_crd.yaml b/manifests/0000_09_cluster-authentication-operator_02_crd.yaml similarity index 100% rename from manifests/0000_09_cluster-osin-operator_02_crd.yaml rename to manifests/0000_09_cluster-authentication-operator_02_crd.yaml diff --git a/manifests/0000_09_cluster-osin-operator_03_cm.yaml b/manifests/0000_09_cluster-authentication-operator_03_cm.yaml similarity index 60% rename from manifests/0000_09_cluster-osin-operator_03_cm.yaml rename to manifests/0000_09_cluster-authentication-operator_03_cm.yaml index 39d7f9f1ab..6fc88db6a7 100644 --- a/manifests/0000_09_cluster-osin-operator_03_cm.yaml +++ b/manifests/0000_09_cluster-authentication-operator_03_cm.yaml @@ -1,8 +1,8 @@ apiVersion: v1 kind: ConfigMap metadata: - namespace: openshift-core-operators - name: origin-cluster-osin-operator-config + namespace: openshift-authentication-operator + name: origin-cluster-authentication-operator-config data: operator-config.yaml: | apiVersion: operator.openshift.io/v1alpha1 diff --git a/manifests/0000_09_cluster-authentication-operator_04_sa.yaml b/manifests/0000_09_cluster-authentication-operator_04_sa.yaml new file mode 100644 index 0000000000..44175dd154 --- /dev/null +++ b/manifests/0000_09_cluster-authentication-operator_04_sa.yaml @@ -0,0 +1,7 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + namespace: openshift-authentication-operator + name: origin-cluster-authentication-operator + labels: + app: origin-cluster-authentication-operator diff --git a/manifests/0000_09_cluster-osin-operator_05_deploy.yaml b/manifests/0000_09_cluster-authentication-operator_05_deploy.yaml similarity index 75% rename from manifests/0000_09_cluster-osin-operator_05_deploy.yaml rename to manifests/0000_09_cluster-authentication-operator_05_deploy.yaml index e8765c1041..4d95d21199 100644 --- a/manifests/0000_09_cluster-osin-operator_05_deploy.yaml +++ b/manifests/0000_09_cluster-authentication-operator_05_deploy.yaml @@ -16,12 +16,12 @@ spec: labels: app: origin-cluster-osin-operator spec: - serviceAccountName: origin-cluster-osin-operator + serviceAccountName: origin-cluster-authentication-operator containers: - name: operator image: quay.io/openshift/origin-cluster-authentication-operator:latest imagePullPolicy: IfNotPresent - command: ["osin-operator", "operator"] + command: ["authentication-operator", "operator"] args: - "--config=/var/run/configmaps/config/operator-config.yaml" - "-v=4" @@ -32,7 +32,7 @@ spec: - name: config configMap: defaultMode: 440 - name: origin-cluster-osin-operator-config + name: origin-cluster-authentication-operator-config nodeSelector: node-role.kubernetes.io/master: "" tolerations: @@ -41,27 +41,27 @@ spec: apiVersion: apps/v1 kind: Deployment metadata: - namespace: openshift-core-operators - name: origin-cluster-osin-operator2 + namespace: openshift-authentication-operator + name: origin-cluster-authentication-operator labels: - app: origin-cluster-osin-operator2 + app: origin-cluster-authentication-operator spec: replicas: 1 selector: matchLabels: - app: origin-cluster-osin-operator2 + app: origin-cluster-authentication-operator template: metadata: - name: origin-cluster-osin-operator + name: origin-cluster-authentication-operator labels: - app: origin-cluster-osin-operator2 + app: origin-cluster-authentication-operator spec: - serviceAccountName: origin-cluster-osin-operator + serviceAccountName: origin-cluster-authentication-operator containers: - name: operator image: quay.io/openshift/origin-cluster-authentication-operator:latest imagePullPolicy: IfNotPresent - command: ["osin-operator", "operator2"] + command: ["authentication-operator", "operator"] args: - "--config=/var/run/configmaps/config/operator-config.yaml" - "-v=4" @@ -82,7 +82,7 @@ spec: - name: config configMap: defaultMode: 440 - name: origin-cluster-osin-operator-config + name: origin-cluster-authentication-operator-config nodeSelector: node-role.kubernetes.io/master: "" tolerations: diff --git a/manifests/0000_09_cluster-osin-operator_06_authentication_crd.yaml b/manifests/0000_09_cluster-authentication-operator_06_authentication_crd.yaml similarity index 100% rename from manifests/0000_09_cluster-osin-operator_06_authentication_crd.yaml rename to manifests/0000_09_cluster-authentication-operator_06_authentication_crd.yaml diff --git a/manifests/0000_09_cluster-osin-operator_04_sa.yaml b/manifests/0000_09_cluster-osin-operator_04_sa.yaml deleted file mode 100644 index 7c7d6d42c1..0000000000 --- a/manifests/0000_09_cluster-osin-operator_04_sa.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: v1 -kind: ServiceAccount -metadata: - namespace: openshift-core-operators - name: origin-cluster-osin-operator - labels: - app: origin-cluster-osin-operator diff --git a/pkg/apis/authentication/install.go b/pkg/apis/authentication/install.go index 57a48a863b..6fe7206aab 100644 --- a/pkg/apis/authentication/install.go +++ b/pkg/apis/authentication/install.go @@ -4,7 +4,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - authv1alpha1 "github.com/openshift/cluster-osin-operator/pkg/apis/authentication/v1alpha1" + authv1alpha1 "github.com/openshift/cluster-authentication-operator/pkg/apis/authentication/v1alpha1" ) const ( diff --git a/pkg/boilerplate/operator/filter.go b/pkg/boilerplate/operator/filter.go index f928dfd2ac..e496d83c8e 100644 --- a/pkg/boilerplate/operator/filter.go +++ b/pkg/boilerplate/operator/filter.go @@ -1,6 +1,6 @@ package operator -import "github.com/openshift/cluster-osin-operator/pkg/boilerplate/controller" +import "github.com/openshift/cluster-authentication-operator/pkg/boilerplate/controller" func FilterByNames(names ...string) controller.Filter { return controller.FilterByNames(nil, names...) diff --git a/pkg/boilerplate/operator/operator.go b/pkg/boilerplate/operator/operator.go index efb1e541a5..71eb314f35 100644 --- a/pkg/boilerplate/operator/operator.go +++ b/pkg/boilerplate/operator/operator.go @@ -1,6 +1,6 @@ package operator -import "github.com/openshift/cluster-osin-operator/pkg/boilerplate/controller" +import "github.com/openshift/cluster-authentication-operator/pkg/boilerplate/controller" type Runner interface { Run(stopCh <-chan struct{}) diff --git a/pkg/boilerplate/operator/option.go b/pkg/boilerplate/operator/option.go index 6da78828fb..1cadd1ce20 100644 --- a/pkg/boilerplate/operator/option.go +++ b/pkg/boilerplate/operator/option.go @@ -3,7 +3,7 @@ package operator import ( "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/openshift/cluster-osin-operator/pkg/boilerplate/controller" + "github.com/openshift/cluster-authentication-operator/pkg/boilerplate/controller" ) // key is the singleton key shared by all events diff --git a/pkg/boilerplate/operator/sync.go b/pkg/boilerplate/operator/sync.go index efe4fb1f92..cfdd51897c 100644 --- a/pkg/boilerplate/operator/sync.go +++ b/pkg/boilerplate/operator/sync.go @@ -3,7 +3,7 @@ package operator import ( "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/openshift/cluster-osin-operator/pkg/boilerplate/controller" + "github.com/openshift/cluster-authentication-operator/pkg/boilerplate/controller" ) type KeySyncer interface { diff --git a/pkg/cmd/operator/cmd.go b/pkg/cmd/operator/cmd.go index 1626607c4b..1849978948 100644 --- a/pkg/cmd/operator/cmd.go +++ b/pkg/cmd/operator/cmd.go @@ -3,8 +3,8 @@ package operator import ( "github.com/spf13/cobra" - "github.com/openshift/cluster-osin-operator/pkg/operator" - "github.com/openshift/cluster-osin-operator/pkg/version" + "github.com/openshift/cluster-authentication-operator/pkg/operator" + "github.com/openshift/cluster-authentication-operator/pkg/version" "github.com/openshift/library-go/pkg/controller/controllercmd" ) diff --git a/pkg/cmd/operator2/cmd.go b/pkg/cmd/operator2/cmd.go index 33518463f5..21cae4e644 100644 --- a/pkg/cmd/operator2/cmd.go +++ b/pkg/cmd/operator2/cmd.go @@ -3,19 +3,19 @@ package operator2 import ( "github.com/spf13/cobra" - "github.com/openshift/cluster-osin-operator/pkg/operator2" - "github.com/openshift/cluster-osin-operator/pkg/version" + "github.com/openshift/cluster-authentication-operator/pkg/operator2" + "github.com/openshift/cluster-authentication-operator/pkg/version" "github.com/openshift/library-go/pkg/controller/controllercmd" ) const ( - componentName = "cluster-osin-operator2" - componentNamespace = "openshift-core-operators" + componentName = "cluster-authentication-operator" + componentNamespace = "openshift-authentication-operator" ) func NewOperator() *cobra.Command { cmd := controllercmd.NewControllerCommandConfig(componentName, version.Get(), operator2.RunOperator).NewCommand() - cmd.Use = "operator2" - cmd.Short = "Start the Osin Operator2" // temp names and such + cmd.Use = "operator" + cmd.Short = "Start the Authentication Operator" return cmd } diff --git a/pkg/generated/clientset/versioned/clientset.go b/pkg/generated/clientset/versioned/clientset.go index 11e06ea203..3300ce6529 100644 --- a/pkg/generated/clientset/versioned/clientset.go +++ b/pkg/generated/clientset/versioned/clientset.go @@ -3,7 +3,7 @@ package versioned import ( - authenticationv1alpha1 "github.com/openshift/cluster-osin-operator/pkg/generated/clientset/versioned/typed/authentication/v1alpha1" + authenticationv1alpha1 "github.com/openshift/cluster-authentication-operator/pkg/generated/clientset/versioned/typed/authentication/v1alpha1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" diff --git a/pkg/generated/clientset/versioned/fake/clientset_generated.go b/pkg/generated/clientset/versioned/fake/clientset_generated.go index bfc8f25ab6..eedda88d65 100644 --- a/pkg/generated/clientset/versioned/fake/clientset_generated.go +++ b/pkg/generated/clientset/versioned/fake/clientset_generated.go @@ -3,9 +3,9 @@ package fake import ( - clientset "github.com/openshift/cluster-osin-operator/pkg/generated/clientset/versioned" - authenticationv1alpha1 "github.com/openshift/cluster-osin-operator/pkg/generated/clientset/versioned/typed/authentication/v1alpha1" - fakeauthenticationv1alpha1 "github.com/openshift/cluster-osin-operator/pkg/generated/clientset/versioned/typed/authentication/v1alpha1/fake" + clientset "github.com/openshift/cluster-authentication-operator/pkg/generated/clientset/versioned" + authenticationv1alpha1 "github.com/openshift/cluster-authentication-operator/pkg/generated/clientset/versioned/typed/authentication/v1alpha1" + fakeauthenticationv1alpha1 "github.com/openshift/cluster-authentication-operator/pkg/generated/clientset/versioned/typed/authentication/v1alpha1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" diff --git a/pkg/generated/clientset/versioned/fake/register.go b/pkg/generated/clientset/versioned/fake/register.go index d26b12985a..44a16b790b 100644 --- a/pkg/generated/clientset/versioned/fake/register.go +++ b/pkg/generated/clientset/versioned/fake/register.go @@ -3,7 +3,7 @@ package fake import ( - authenticationv1alpha1 "github.com/openshift/cluster-osin-operator/pkg/apis/authentication/v1alpha1" + authenticationv1alpha1 "github.com/openshift/cluster-authentication-operator/pkg/apis/authentication/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/generated/clientset/versioned/scheme/register.go b/pkg/generated/clientset/versioned/scheme/register.go index 794e178016..5c3508bf2c 100644 --- a/pkg/generated/clientset/versioned/scheme/register.go +++ b/pkg/generated/clientset/versioned/scheme/register.go @@ -3,7 +3,7 @@ package scheme import ( - authenticationv1alpha1 "github.com/openshift/cluster-osin-operator/pkg/apis/authentication/v1alpha1" + authenticationv1alpha1 "github.com/openshift/cluster-authentication-operator/pkg/apis/authentication/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/generated/clientset/versioned/typed/authentication/v1alpha1/authentication_client.go b/pkg/generated/clientset/versioned/typed/authentication/v1alpha1/authentication_client.go index 62afc17b0a..4bc390df16 100644 --- a/pkg/generated/clientset/versioned/typed/authentication/v1alpha1/authentication_client.go +++ b/pkg/generated/clientset/versioned/typed/authentication/v1alpha1/authentication_client.go @@ -3,8 +3,8 @@ package v1alpha1 import ( - v1alpha1 "github.com/openshift/cluster-osin-operator/pkg/apis/authentication/v1alpha1" - "github.com/openshift/cluster-osin-operator/pkg/generated/clientset/versioned/scheme" + v1alpha1 "github.com/openshift/cluster-authentication-operator/pkg/apis/authentication/v1alpha1" + "github.com/openshift/cluster-authentication-operator/pkg/generated/clientset/versioned/scheme" serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" ) diff --git a/pkg/generated/clientset/versioned/typed/authentication/v1alpha1/authenticationoperatorconfig.go b/pkg/generated/clientset/versioned/typed/authentication/v1alpha1/authenticationoperatorconfig.go index 3b8e2923fe..6bdfc5e508 100644 --- a/pkg/generated/clientset/versioned/typed/authentication/v1alpha1/authenticationoperatorconfig.go +++ b/pkg/generated/clientset/versioned/typed/authentication/v1alpha1/authenticationoperatorconfig.go @@ -3,8 +3,8 @@ package v1alpha1 import ( - v1alpha1 "github.com/openshift/cluster-osin-operator/pkg/apis/authentication/v1alpha1" - scheme "github.com/openshift/cluster-osin-operator/pkg/generated/clientset/versioned/scheme" + v1alpha1 "github.com/openshift/cluster-authentication-operator/pkg/apis/authentication/v1alpha1" + scheme "github.com/openshift/cluster-authentication-operator/pkg/generated/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/generated/clientset/versioned/typed/authentication/v1alpha1/fake/fake_authentication_client.go b/pkg/generated/clientset/versioned/typed/authentication/v1alpha1/fake/fake_authentication_client.go index ab6bbec4dc..fa0156b936 100644 --- a/pkg/generated/clientset/versioned/typed/authentication/v1alpha1/fake/fake_authentication_client.go +++ b/pkg/generated/clientset/versioned/typed/authentication/v1alpha1/fake/fake_authentication_client.go @@ -3,7 +3,7 @@ package fake import ( - v1alpha1 "github.com/openshift/cluster-osin-operator/pkg/generated/clientset/versioned/typed/authentication/v1alpha1" + v1alpha1 "github.com/openshift/cluster-authentication-operator/pkg/generated/clientset/versioned/typed/authentication/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/pkg/generated/clientset/versioned/typed/authentication/v1alpha1/fake/fake_authenticationoperatorconfig.go b/pkg/generated/clientset/versioned/typed/authentication/v1alpha1/fake/fake_authenticationoperatorconfig.go index 0fb10e51b5..2b2996e49a 100644 --- a/pkg/generated/clientset/versioned/typed/authentication/v1alpha1/fake/fake_authenticationoperatorconfig.go +++ b/pkg/generated/clientset/versioned/typed/authentication/v1alpha1/fake/fake_authenticationoperatorconfig.go @@ -3,7 +3,7 @@ package fake import ( - v1alpha1 "github.com/openshift/cluster-osin-operator/pkg/apis/authentication/v1alpha1" + v1alpha1 "github.com/openshift/cluster-authentication-operator/pkg/apis/authentication/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/generated/informers/externalversions/authentication/interface.go b/pkg/generated/informers/externalversions/authentication/interface.go index 804c9a5dcf..b8149dee7f 100644 --- a/pkg/generated/informers/externalversions/authentication/interface.go +++ b/pkg/generated/informers/externalversions/authentication/interface.go @@ -3,8 +3,8 @@ package authentication import ( - v1alpha1 "github.com/openshift/cluster-osin-operator/pkg/generated/informers/externalversions/authentication/v1alpha1" - internalinterfaces "github.com/openshift/cluster-osin-operator/pkg/generated/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/openshift/cluster-authentication-operator/pkg/generated/informers/externalversions/authentication/v1alpha1" + internalinterfaces "github.com/openshift/cluster-authentication-operator/pkg/generated/informers/externalversions/internalinterfaces" ) // Interface provides access to each of this group's versions. diff --git a/pkg/generated/informers/externalversions/authentication/v1alpha1/authenticationoperatorconfig.go b/pkg/generated/informers/externalversions/authentication/v1alpha1/authenticationoperatorconfig.go index c28ab03989..15b8b5a554 100644 --- a/pkg/generated/informers/externalversions/authentication/v1alpha1/authenticationoperatorconfig.go +++ b/pkg/generated/informers/externalversions/authentication/v1alpha1/authenticationoperatorconfig.go @@ -5,10 +5,10 @@ package v1alpha1 import ( time "time" - authentication_v1alpha1 "github.com/openshift/cluster-osin-operator/pkg/apis/authentication/v1alpha1" - versioned "github.com/openshift/cluster-osin-operator/pkg/generated/clientset/versioned" - internalinterfaces "github.com/openshift/cluster-osin-operator/pkg/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/openshift/cluster-osin-operator/pkg/generated/listers/authentication/v1alpha1" + authentication_v1alpha1 "github.com/openshift/cluster-authentication-operator/pkg/apis/authentication/v1alpha1" + versioned "github.com/openshift/cluster-authentication-operator/pkg/generated/clientset/versioned" + internalinterfaces "github.com/openshift/cluster-authentication-operator/pkg/generated/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/openshift/cluster-authentication-operator/pkg/generated/listers/authentication/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/generated/informers/externalversions/authentication/v1alpha1/interface.go b/pkg/generated/informers/externalversions/authentication/v1alpha1/interface.go index b637286ae0..c68ca965ab 100644 --- a/pkg/generated/informers/externalversions/authentication/v1alpha1/interface.go +++ b/pkg/generated/informers/externalversions/authentication/v1alpha1/interface.go @@ -3,7 +3,7 @@ package v1alpha1 import ( - internalinterfaces "github.com/openshift/cluster-osin-operator/pkg/generated/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/openshift/cluster-authentication-operator/pkg/generated/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/pkg/generated/informers/externalversions/factory.go b/pkg/generated/informers/externalversions/factory.go index 031ea3c54f..f0127946eb 100644 --- a/pkg/generated/informers/externalversions/factory.go +++ b/pkg/generated/informers/externalversions/factory.go @@ -7,9 +7,9 @@ import ( sync "sync" time "time" - versioned "github.com/openshift/cluster-osin-operator/pkg/generated/clientset/versioned" - authentication "github.com/openshift/cluster-osin-operator/pkg/generated/informers/externalversions/authentication" - internalinterfaces "github.com/openshift/cluster-osin-operator/pkg/generated/informers/externalversions/internalinterfaces" + versioned "github.com/openshift/cluster-authentication-operator/pkg/generated/clientset/versioned" + authentication "github.com/openshift/cluster-authentication-operator/pkg/generated/informers/externalversions/authentication" + internalinterfaces "github.com/openshift/cluster-authentication-operator/pkg/generated/informers/externalversions/internalinterfaces" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/generated/informers/externalversions/generic.go b/pkg/generated/informers/externalversions/generic.go index 5e91446c91..57451523f4 100644 --- a/pkg/generated/informers/externalversions/generic.go +++ b/pkg/generated/informers/externalversions/generic.go @@ -5,7 +5,7 @@ package externalversions import ( "fmt" - v1alpha1 "github.com/openshift/cluster-osin-operator/pkg/apis/authentication/v1alpha1" + v1alpha1 "github.com/openshift/cluster-authentication-operator/pkg/apis/authentication/v1alpha1" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" ) diff --git a/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go b/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go index 9e26b66e88..0708925bb5 100644 --- a/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -5,7 +5,7 @@ package internalinterfaces import ( time "time" - versioned "github.com/openshift/cluster-osin-operator/pkg/generated/clientset/versioned" + versioned "github.com/openshift/cluster-authentication-operator/pkg/generated/clientset/versioned" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" diff --git a/pkg/generated/listers/authentication/v1alpha1/authenticationoperatorconfig.go b/pkg/generated/listers/authentication/v1alpha1/authenticationoperatorconfig.go index 39be61761d..5c8d699122 100644 --- a/pkg/generated/listers/authentication/v1alpha1/authenticationoperatorconfig.go +++ b/pkg/generated/listers/authentication/v1alpha1/authenticationoperatorconfig.go @@ -3,7 +3,7 @@ package v1alpha1 import ( - v1alpha1 "github.com/openshift/cluster-osin-operator/pkg/apis/authentication/v1alpha1" + v1alpha1 "github.com/openshift/cluster-authentication-operator/pkg/apis/authentication/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/operator/operator.go b/pkg/operator/operator.go index 5935e44490..b66762fa96 100644 --- a/pkg/operator/operator.go +++ b/pkg/operator/operator.go @@ -13,8 +13,8 @@ import ( "k8s.io/client-go/informers/core/v1" coreclientv1 "k8s.io/client-go/kubernetes/typed/core/v1" - "github.com/openshift/cluster-osin-operator/pkg/boilerplate/controller" - "github.com/openshift/cluster-osin-operator/pkg/boilerplate/operator" + "github.com/openshift/cluster-authentication-operator/pkg/boilerplate/controller" + "github.com/openshift/cluster-authentication-operator/pkg/boilerplate/operator" "github.com/openshift/library-go/pkg/operator/resource/resourcemerge" ) diff --git a/pkg/operator/starter.go b/pkg/operator/starter.go index b66b605e34..c21049e6e0 100644 --- a/pkg/operator/starter.go +++ b/pkg/operator/starter.go @@ -16,7 +16,7 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/cache" - "github.com/openshift/cluster-osin-operator/pkg/boilerplate/controller" + "github.com/openshift/cluster-authentication-operator/pkg/boilerplate/controller" "github.com/openshift/library-go/pkg/controller/controllercmd" ) diff --git a/pkg/operator2/operator.go b/pkg/operator2/operator.go index 6a42a9ff6a..a3fd7ff4df 100644 --- a/pkg/operator2/operator.go +++ b/pkg/operator2/operator.go @@ -18,18 +18,18 @@ import ( configinformer "github.com/openshift/client-go/config/informers/externalversions" routeclient "github.com/openshift/client-go/route/clientset/versioned/typed/route/v1" routeinformer "github.com/openshift/client-go/route/informers/externalversions/route/v1" - authv1alpha1 "github.com/openshift/cluster-osin-operator/pkg/apis/authentication/v1alpha1" - "github.com/openshift/cluster-osin-operator/pkg/boilerplate/controller" - "github.com/openshift/cluster-osin-operator/pkg/boilerplate/operator" - authopclient "github.com/openshift/cluster-osin-operator/pkg/generated/clientset/versioned/typed/authentication/v1alpha1" - authopinformer "github.com/openshift/cluster-osin-operator/pkg/generated/informers/externalversions/authentication/v1alpha1" + authv1alpha1 "github.com/openshift/cluster-authentication-operator/pkg/apis/authentication/v1alpha1" + "github.com/openshift/cluster-authentication-operator/pkg/boilerplate/controller" + "github.com/openshift/cluster-authentication-operator/pkg/boilerplate/operator" + authopclient "github.com/openshift/cluster-authentication-operator/pkg/generated/clientset/versioned/typed/authentication/v1alpha1" + authopinformer "github.com/openshift/cluster-authentication-operator/pkg/generated/informers/externalversions/authentication/v1alpha1" "github.com/openshift/library-go/pkg/operator/events" "github.com/openshift/library-go/pkg/operator/resource/resourceapply" "github.com/openshift/library-go/pkg/operator/resourcesynccontroller" ) const ( - targetName = "openshift-osin" // TODO fix + targetName = "openshift-authentication" configKey = "config.yaml" @@ -210,7 +210,7 @@ func (c *authOperator) handleSync(configOverrides []byte) error { func defaultLabels() map[string]string { return map[string]string{ - "app": "origin-cluster-osin-operator2", + "app": "origin-cluster-authentication-operator", } } diff --git a/pkg/operator2/starter.go b/pkg/operator2/starter.go index deb5b38d19..c188496738 100644 --- a/pkg/operator2/starter.go +++ b/pkg/operator2/starter.go @@ -18,9 +18,9 @@ import ( configinformer "github.com/openshift/client-go/config/informers/externalversions" routeclient "github.com/openshift/client-go/route/clientset/versioned" routeinformer "github.com/openshift/client-go/route/informers/externalversions" - authv1alpha1 "github.com/openshift/cluster-osin-operator/pkg/apis/authentication/v1alpha1" - authopclient "github.com/openshift/cluster-osin-operator/pkg/generated/clientset/versioned" - authopinformer "github.com/openshift/cluster-osin-operator/pkg/generated/informers/externalversions" + authv1alpha1 "github.com/openshift/cluster-authentication-operator/pkg/apis/authentication/v1alpha1" + authopclient "github.com/openshift/cluster-authentication-operator/pkg/generated/clientset/versioned" + authopinformer "github.com/openshift/cluster-authentication-operator/pkg/generated/informers/externalversions" "github.com/openshift/library-go/pkg/controller/controllercmd" "github.com/openshift/library-go/pkg/operator/resourcesynccontroller" "github.com/openshift/library-go/pkg/operator/v1helpers" diff --git a/tools/changelog/changelog.go b/tools/changelog/changelog.go index 2bd6c88f94..22eb4675fa 100644 --- a/tools/changelog/changelog.go +++ b/tools/changelog/changelog.go @@ -183,7 +183,7 @@ func main() { // github merge // has api changes - display := fmt.Sprintf("%s [\\#%s](https://github.com/openshift/cluster-osin-operator/pull/%s)", message, matches[1], matches[1]) + display := fmt.Sprintf("%s [\\#%s](https://github.com/openshift/cluster-authentication-operator/pull/%s)", message, matches[1], matches[1]) if hasFileChanges(c.short, "api/") { apiChanges = append(apiChanges, display) } diff --git a/tools/gotest2junit/gotest2junit.go b/tools/gotest2junit/gotest2junit.go index 15f678e1fd..403a235882 100644 --- a/tools/gotest2junit/gotest2junit.go +++ b/tools/gotest2junit/gotest2junit.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "github.com/openshift/cluster-osin-operator/tools/gotest2junit/pkg/api" + "github.com/openshift/cluster-authentication-operator/tools/gotest2junit/pkg/api" ) type Record struct { diff --git a/tools/import-verifier/import-verifier.go b/tools/import-verifier/import-verifier.go index cc5f361a43..d9b9050fa1 100644 --- a/tools/import-verifier/import-verifier.go +++ b/tools/import-verifier/import-verifier.go @@ -62,7 +62,7 @@ func (i *ImportRestriction) ForbiddenImportsFor(pkg Package) []string { // - it does not fall under any of the ignored sub-trees func (i *ImportRestriction) isRestrictedPath(packageToCheck string) bool { // if its not under our root, then its a built-in. Everything else is under - // github.com/openshift/service-serving-cert-signer or github.com/openshift/cluster-osin-operator/vendor + // github.com/openshift/service-serving-cert-signer or github.com/openshift/cluster-authentication-operator/vendor if !strings.HasPrefix(packageToCheck, rootPackage) { return false } @@ -103,7 +103,7 @@ func (i *ImportRestriction) forbiddenImportsFor(pkg Package) []string { // - is not of an allowed path or a sub-package of one func (i *ImportRestriction) isAllowed(packageToCheck string) bool { // if its not under our root, then its a built-in. Everything else is under - // github.com/openshift/service-serving-cert-signer or github.com/openshift/cluster-osin-operator/vendor + // github.com/openshift/service-serving-cert-signer or github.com/openshift/cluster-authentication-operator/vendor if !strings.HasPrefix(packageToCheck, rootPackage) { return true } diff --git a/tools/junitreport/junitreport.go b/tools/junitreport/junitreport.go index 58efba0419..d5394eaf74 100644 --- a/tools/junitreport/junitreport.go +++ b/tools/junitreport/junitreport.go @@ -7,7 +7,7 @@ import ( "os" "strings" - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/cmd" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/cmd" ) var ( diff --git a/tools/junitreport/pkg/builder/flat/test_suites_builder.go b/tools/junitreport/pkg/builder/flat/test_suites_builder.go index 980398d00c..cf1aa608dd 100644 --- a/tools/junitreport/pkg/builder/flat/test_suites_builder.go +++ b/tools/junitreport/pkg/builder/flat/test_suites_builder.go @@ -1,8 +1,8 @@ package flat import ( - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/api" - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/builder" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/api" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/builder" ) // NewTestSuitesBuilder returns a new flat test suites builder. All test suites consumed diff --git a/tools/junitreport/pkg/builder/flat/test_suites_builder_test.go b/tools/junitreport/pkg/builder/flat/test_suites_builder_test.go index 4cb47cb1be..e05ad1c57d 100644 --- a/tools/junitreport/pkg/builder/flat/test_suites_builder_test.go +++ b/tools/junitreport/pkg/builder/flat/test_suites_builder_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/api" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/api" ) func TestAddSuite(t *testing.T) { diff --git a/tools/junitreport/pkg/builder/interfaces.go b/tools/junitreport/pkg/builder/interfaces.go index 59201e4e72..4d02723006 100644 --- a/tools/junitreport/pkg/builder/interfaces.go +++ b/tools/junitreport/pkg/builder/interfaces.go @@ -1,6 +1,6 @@ package builder -import "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/api" +import "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/api" // TestSuitesBuilder knows how to aggregate data to form a collection of test suites. type TestSuitesBuilder interface { diff --git a/tools/junitreport/pkg/builder/nested/test_suites_builder.go b/tools/junitreport/pkg/builder/nested/test_suites_builder.go index f31a93452d..397956538d 100644 --- a/tools/junitreport/pkg/builder/nested/test_suites_builder.go +++ b/tools/junitreport/pkg/builder/nested/test_suites_builder.go @@ -4,8 +4,8 @@ import ( "sort" "strings" - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/api" - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/builder" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/api" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/builder" ) // NewTestSuitesBuilder returns a new nested test suites builder. All test suites consumed by diff --git a/tools/junitreport/pkg/builder/nested/test_suites_builder_test.go b/tools/junitreport/pkg/builder/nested/test_suites_builder_test.go index e968745def..edcbc65fdf 100644 --- a/tools/junitreport/pkg/builder/nested/test_suites_builder_test.go +++ b/tools/junitreport/pkg/builder/nested/test_suites_builder_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/api" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/api" ) func TestGetParentName(t *testing.T) { diff --git a/tools/junitreport/pkg/cmd/junitreport.go b/tools/junitreport/pkg/cmd/junitreport.go index 32ffff8fe4..1a3f32041d 100644 --- a/tools/junitreport/pkg/cmd/junitreport.go +++ b/tools/junitreport/pkg/cmd/junitreport.go @@ -6,12 +6,12 @@ import ( "fmt" "io" - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/builder" - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/builder/flat" - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/builder/nested" - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/parser" - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/parser/gotest" - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/parser/oscmd" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/builder" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/builder/flat" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/builder/nested" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/parser" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/parser/gotest" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/parser/oscmd" ) type testSuitesBuilderType string diff --git a/tools/junitreport/pkg/cmd/summarize.go b/tools/junitreport/pkg/cmd/summarize.go index 663e9f4791..cdfc76b11c 100644 --- a/tools/junitreport/pkg/cmd/summarize.go +++ b/tools/junitreport/pkg/cmd/summarize.go @@ -6,7 +6,7 @@ import ( "fmt" "io" - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/api" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/api" ) // Summarize reads the input into a TestSuites structure and summarizes the tests contained within, diff --git a/tools/junitreport/pkg/parser/gotest/data_parser.go b/tools/junitreport/pkg/parser/gotest/data_parser.go index 6c2b1e84cf..11efcbf0ac 100644 --- a/tools/junitreport/pkg/parser/gotest/data_parser.go +++ b/tools/junitreport/pkg/parser/gotest/data_parser.go @@ -3,7 +3,7 @@ package gotest import ( "regexp" - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/api" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/api" ) // testStartPattern matches the line in verbose `go test` output that marks the declaration of a test. diff --git a/tools/junitreport/pkg/parser/gotest/data_parser_test.go b/tools/junitreport/pkg/parser/gotest/data_parser_test.go index aaa671a8cc..38a189f3f4 100644 --- a/tools/junitreport/pkg/parser/gotest/data_parser_test.go +++ b/tools/junitreport/pkg/parser/gotest/data_parser_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/api" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/api" ) func TestExtractRunOk(t *testing.T) { diff --git a/tools/junitreport/pkg/parser/gotest/parser.go b/tools/junitreport/pkg/parser/gotest/parser.go index fdc7fe5810..db69b3e3d3 100644 --- a/tools/junitreport/pkg/parser/gotest/parser.go +++ b/tools/junitreport/pkg/parser/gotest/parser.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/api" - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/builder" - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/parser" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/api" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/builder" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/parser" ) // NewParser returns a new parser that's capable of parsing Go unit test output diff --git a/tools/junitreport/pkg/parser/gotest/parser_flat_test.go b/tools/junitreport/pkg/parser/gotest/parser_flat_test.go index f52f67f903..2b0858a6c8 100644 --- a/tools/junitreport/pkg/parser/gotest/parser_flat_test.go +++ b/tools/junitreport/pkg/parser/gotest/parser_flat_test.go @@ -6,8 +6,8 @@ import ( "reflect" "testing" - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/api" - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/builder/flat" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/api" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/builder/flat" ) // TestFlatParse tests that parsing the `go test` output in the test directory with a flat builder works as expected diff --git a/tools/junitreport/pkg/parser/gotest/parser_nested_test.go b/tools/junitreport/pkg/parser/gotest/parser_nested_test.go index 2cebd67d16..0e7ee6572b 100644 --- a/tools/junitreport/pkg/parser/gotest/parser_nested_test.go +++ b/tools/junitreport/pkg/parser/gotest/parser_nested_test.go @@ -8,8 +8,8 @@ import ( "k8s.io/apimachinery/pkg/util/diff" - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/api" - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/builder/nested" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/api" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/builder/nested" ) // TestNestedParse tests that parsing the `go test` output in the test directory with a nested builder works as expected @@ -450,7 +450,7 @@ func TestNestedParse(t *testing.T) { }, }, { - Name: "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/parser/gotest/example", + Name: "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/parser/gotest/example", NumTests: 19, NumFailed: 9, Duration: 0.006, diff --git a/tools/junitreport/pkg/parser/interfaces.go b/tools/junitreport/pkg/parser/interfaces.go index f30e2ee5c8..267415cc9f 100644 --- a/tools/junitreport/pkg/parser/interfaces.go +++ b/tools/junitreport/pkg/parser/interfaces.go @@ -3,7 +3,7 @@ package parser import ( "bufio" - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/api" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/api" ) // TestOutputParser knows how to parse test output to create a collection of test suites diff --git a/tools/junitreport/pkg/parser/oscmd/data_parser.go b/tools/junitreport/pkg/parser/oscmd/data_parser.go index ea08035163..fdc1371e99 100644 --- a/tools/junitreport/pkg/parser/oscmd/data_parser.go +++ b/tools/junitreport/pkg/parser/oscmd/data_parser.go @@ -3,8 +3,8 @@ package oscmd import ( "regexp" - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/api" - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/parser/stack" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/api" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/parser/stack" ) func newTestDataParser() stack.TestDataParser { diff --git a/tools/junitreport/pkg/parser/oscmd/data_parser_test.go b/tools/junitreport/pkg/parser/oscmd/data_parser_test.go index 65fb284f18..bbe3a63421 100644 --- a/tools/junitreport/pkg/parser/oscmd/data_parser_test.go +++ b/tools/junitreport/pkg/parser/oscmd/data_parser_test.go @@ -3,7 +3,7 @@ package oscmd import ( "testing" - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/api" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/api" ) func TestMarksTestBeginning(t *testing.T) { diff --git a/tools/junitreport/pkg/parser/oscmd/parser.go b/tools/junitreport/pkg/parser/oscmd/parser.go index 64bf429a64..6bfdc1d215 100644 --- a/tools/junitreport/pkg/parser/oscmd/parser.go +++ b/tools/junitreport/pkg/parser/oscmd/parser.go @@ -1,9 +1,9 @@ package oscmd import ( - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/builder" - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/parser" - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/parser/stack" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/builder" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/parser" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/parser/stack" ) // NewParser returns a new parser that's capable of parsing `os::cmd` test output diff --git a/tools/junitreport/pkg/parser/oscmd/parser_flat_test.go b/tools/junitreport/pkg/parser/oscmd/parser_flat_test.go index fd62a37209..771b40d781 100644 --- a/tools/junitreport/pkg/parser/oscmd/parser_flat_test.go +++ b/tools/junitreport/pkg/parser/oscmd/parser_flat_test.go @@ -6,8 +6,8 @@ import ( "reflect" "testing" - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/api" - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/builder/flat" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/api" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/builder/flat" ) // TestFlatParse tests that parsing the `os::cmd` output in the test directory with a flat builder works as expected diff --git a/tools/junitreport/pkg/parser/oscmd/parser_nested_test.go b/tools/junitreport/pkg/parser/oscmd/parser_nested_test.go index 7c4a29695a..5f3c1e2f1f 100644 --- a/tools/junitreport/pkg/parser/oscmd/parser_nested_test.go +++ b/tools/junitreport/pkg/parser/oscmd/parser_nested_test.go @@ -6,8 +6,8 @@ import ( "reflect" "testing" - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/api" - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/builder/nested" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/api" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/builder/nested" ) // TestNestedParse tests that parsing the `go test` output in the test directory with a nested builder works as expected diff --git a/tools/junitreport/pkg/parser/stack/interfaces.go b/tools/junitreport/pkg/parser/stack/interfaces.go index 09ba3a5496..a15ed3b11e 100644 --- a/tools/junitreport/pkg/parser/stack/interfaces.go +++ b/tools/junitreport/pkg/parser/stack/interfaces.go @@ -1,6 +1,6 @@ package stack -import "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/api" +import "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/api" // TestDataParser knows how to take raw test data and extract the useful information from it type TestDataParser interface { diff --git a/tools/junitreport/pkg/parser/stack/parser.go b/tools/junitreport/pkg/parser/stack/parser.go index 10840ad07d..5c211cdd84 100644 --- a/tools/junitreport/pkg/parser/stack/parser.go +++ b/tools/junitreport/pkg/parser/stack/parser.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/api" - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/builder" - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/parser" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/api" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/builder" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/parser" ) // NewParser returns a new parser that's capable of parsing Go unit test output diff --git a/tools/junitreport/pkg/parser/stack/stack.go b/tools/junitreport/pkg/parser/stack/stack.go index d9391d914f..18438daaff 100644 --- a/tools/junitreport/pkg/parser/stack/stack.go +++ b/tools/junitreport/pkg/parser/stack/stack.go @@ -3,7 +3,7 @@ package stack import ( "fmt" - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/api" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/api" ) // TestSuiteStack is a data structure that holds api.TestSuite objects in a LIFO diff --git a/tools/junitreport/pkg/parser/stack/stack_test.go b/tools/junitreport/pkg/parser/stack/stack_test.go index 9b4925aea4..6b390f861d 100644 --- a/tools/junitreport/pkg/parser/stack/stack_test.go +++ b/tools/junitreport/pkg/parser/stack/stack_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/openshift/cluster-osin-operator/tools/junitreport/pkg/api" + "github.com/openshift/cluster-authentication-operator/tools/junitreport/pkg/api" ) func TestPush(t *testing.T) {