Skip to content

rename cluster-osin-operator/cluster-authentication-operator #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sallyom wants to merge 2 commits into from
Closed

rename cluster-osin-operator/cluster-authentication-operator #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0408f8f
replace cluster-osin-operator/cluster-authentication-operator
sallyom Jan 11, 2019
da42a7e
rename imports cluster-osin to cluster-authentication
sallyom Jan 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" \
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile.rhel7
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" \
Expand Down
8 changes: 4 additions & 4 deletions cmd/osin-operator/main.go → cmd/authentication-operator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion glide.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions hack/lib/constants.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}"
Expand All @@ -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[@]##*/}")

Expand Down Expand Up @@ -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" .
}
2 changes: 1 addition & 1 deletion hack/update-codegen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
6 changes: 3 additions & 3 deletions ...00_09_cluster-osin-operator_00_roles.yaml → ...ter-authentication-operator_00_roles.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions ...9_cluster-osin-operator_01_namespace.yaml → ...authentication-operator_01_namespace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
0 ...0000_09_cluster-osin-operator_02_crd.yaml → ...uster-authentication-operator_02_crd.yaml
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions .../0000_09_cluster-osin-operator_03_cm.yaml → ...luster-authentication-operator_03_cm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 7 additions & 0 deletions manifests/0000_09_cluster-authentication-operator_04_sa.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
apiVersion: v1
kind: ServiceAccount
metadata:
namespace: openshift-authentication-operator
name: origin-cluster-authentication-operator
labels:
app: origin-cluster-authentication-operator
24 changes: 12 additions & 12 deletions ...0_09_cluster-osin-operator_05_deploy.yaml → ...er-authentication-operator_05_deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Copy link
Contributor

@enj enj Jan 15, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is the only line I expect to change

Copy link
Contributor Author

@sallyom sallyom Jan 15, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

Copy link
Contributor Author

@sallyom sallyom Jan 15, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so for both deployments, should be same, right?
command: ["authentication-operator", "operator"] (also in pkg/cmd/operator|operator2/cmd.go, same cmd.User for both? operator?)

args:
- "--config=/var/run/configmaps/config/operator-config.yaml"
- "-v=4"
Expand All @@ -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:
Expand All @@ -41,27 +41,27 @@ spec:
apiVersion: apps/v1
kind: Deployment
metadata:
namespace: openshift-core-operators
name: origin-cluster-osin-operator2
namespace: openshift-authentication-operator
Copy link
Contributor

@enj enj Jan 15, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lots of 2's that need to die

Copy link
Contributor Author

@sallyom sallyom Jan 15, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed them

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"
Expand All @@ -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:
Expand Down
0 ...-osin-operator_06_authentication_crd.yaml → ...ation-operator_06_authentication_crd.yaml
View file
Open in desktop
File renamed without changes.
7 changes: 0 additions & 7 deletions manifests/0000_09_cluster-osin-operator_04_sa.yaml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion pkg/apis/authentication/install.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion pkg/boilerplate/operator/filter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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...)
Expand Down
2 changes: 1 addition & 1 deletion pkg/boilerplate/operator/operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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{})
Expand Down
2 changes: 1 addition & 1 deletion pkg/boilerplate/operator/option.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/boilerplate/operator/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions pkg/cmd/operator/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
12 changes: 6 additions & 6 deletions pkg/cmd/operator2/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Contributor

@enj enj Jan 15, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cite requirements

Copy link
Contributor Author

@sallyom sallyom Jan 16, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

from email thread:

ClusterOperator name  "authentication" 
Operator Deployment “cluster-authentication-operator”
Operator Namespace “openshift-authentication-operator”

so, componentName should be "authentication" above according to email? However, looking at a cluster, most operators have the name "openshift-something-operator" and a few have "cluster-something-operator". I'm keeping with cluster-authentication-operator unless I hear otherwise, keeping with minimal change here.

)

func NewOperator() *cobra.Command {
Copy link
Contributor

@enj enj Jan 15, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cmd.User needs fixing

Copy link
Contributor Author

@sallyom sallyom Jan 15, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've changed to operator

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
}
2 changes: 1 addition & 1 deletion pkg/generated/clientset/versioned/clientset.go
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions pkg/generated/clientset/versioned/fake/clientset_generated.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion pkg/generated/clientset/versioned/fake/register.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion pkg/generated/clientset/versioned/scheme/register.go
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions pkg/generated/clientset/versioned/typed/authentication/v1alpha1/authentication_client.go
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions ...nerated/clientset/versioned/typed/authentication/v1alpha1/authenticationoperatorconfig.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion ...ated/clientset/versioned/typed/authentication/v1alpha1/fake/fake_authentication_client.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion ...ientset/versioned/typed/authentication/v1alpha1/fake/fake_authenticationoperatorconfig.go
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions pkg/generated/informers/externalversions/authentication/interface.go
View file
Open in desktop

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

Loading