Skip to content

Commit

Permalink
fixup rename the project to workspace-controller
Browse files Browse the repository at this point in the history
  • Loading branch information
jiridanek committed May 23, 2024
1 parent 72c22b8 commit 0886d6c
Show file tree
Hide file tree
Showing 21 changed files with 27 additions and 30 deletions.
2 changes: 1 addition & 1 deletion workspaces/controller/PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
domain: kubeflow.org
layout:
- go.kubebuilder.io/v4
projectName: workspaces-controller
projectName: workspace-controller
repo: github.com/kubeflow/notebooks/workspaces/controller
resources:
- api:
Expand Down
11 changes: 4 additions & 7 deletions workspaces/controller/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ The Kubeflow Workspace Controller is responsible for reconciling the `Workspace`
> The Kubeflow Workspace Controller is a work in progress and is __NOT__ currently ready for use.
> We greatly appreciate any contributions.


## Getting Started

### Prerequisites
Expand All @@ -20,7 +18,7 @@ The Kubeflow Workspace Controller is responsible for reconciling the `Workspace`
**Build and push your image to the location specified by `IMG`:**

```sh
make docker-build docker-push IMG=<some-registry>/workspaces-controller:tag
make docker-build docker-push IMG=<some-registry>/workspace-controller:tag
```

**NOTE:** This image ought to be published in the personal registry you specified.
Expand All @@ -36,7 +34,7 @@ make install
**Deploy the Manager to the cluster with the image specified by `IMG`:**

```sh
make deploy IMG=<some-registry>/workspaces-controller:tag
make deploy IMG=<some-registry>/workspace-controller:tag
```

> **NOTE**: If you encounter RBAC errors, you may need to grant yourself cluster-admin
Expand Down Expand Up @@ -77,7 +75,7 @@ Following are the steps to build the installer and distribute this project to us
1. Build the installer for the image built and published in the registry:

```sh
make build-installer IMG=<some-registry>/workspaces-controller:tag
make build-installer IMG=<some-registry>/workspace-controller:tag
```

NOTE: The makefile target mentioned above generates an 'install.yaml'
Expand All @@ -90,6 +88,5 @@ its dependencies.
Users can just run kubectl apply -f <URL for YAML BUNDLE> to install the project, i.e.:

```sh
kubectl apply -f https://raw.githubusercontent.com/<org>/workspaces-controller/<tag or branch>/dist/install.yaml
kubectl apply -f https://raw.githubusercontent.com/<org>/workspace-controller/<tag or branch>/dist/install.yaml
```

4 changes: 2 additions & 2 deletions workspaces/controller/config/default/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Adds namespace to all resources.
namespace: workspaces-controller-system
namespace: workspace-controller-system

# Value of this field is prepended to the
# names of all resources, e.g. a deployment named
# "wordpress" becomes "alices-wordpress".
# Note that it should also match with the prefix (text before '-') of the namespace
# field above.
namePrefix: workspaces-controller-
namePrefix: workspace-controller-

# Labels to add to all resources and selectors.
#labels:
Expand Down
4 changes: 2 additions & 2 deletions workspaces/controller/config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Namespace
metadata:
labels:
control-plane: controller-manager
app.kubernetes.io/name: workspaces-controller
app.kubernetes.io/name: workspace-controller
app.kubernetes.io/managed-by: kustomize
name: system
---
Expand All @@ -14,7 +14,7 @@ metadata:
namespace: system
labels:
control-plane: controller-manager
app.kubernetes.io/name: workspaces-controller
app.kubernetes.io/name: workspace-controller
app.kubernetes.io/managed-by: kustomize
spec:
selector:
Expand Down
2 changes: 1 addition & 1 deletion workspaces/controller/config/prometheus/monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ kind: ServiceMonitor
metadata:
labels:
control-plane: controller-manager
app.kubernetes.io/name: workspaces-controller
app.kubernetes.io/name: workspace-controller
app.kubernetes.io/managed-by: kustomize
name: controller-manager-metrics-monitor
namespace: system
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
app.kubernetes.io/name: workspaces-controller
app.kubernetes.io/name: workspace-controller
app.kubernetes.io/managed-by: kustomize
name: metrics-reader
rules:
Expand Down
2 changes: 1 addition & 1 deletion workspaces/controller/config/rbac/auth_proxy_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
app.kubernetes.io/name: workspaces-controller
app.kubernetes.io/name: workspace-controller
app.kubernetes.io/managed-by: kustomize
name: proxy-role
rules:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
labels:
app.kubernetes.io/name: workspaces-controller
app.kubernetes.io/name: workspace-controller
app.kubernetes.io/managed-by: kustomize
name: proxy-rolebinding
roleRef:
Expand Down
2 changes: 1 addition & 1 deletion workspaces/controller/config/rbac/auth_proxy_service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Service
metadata:
labels:
control-plane: controller-manager
app.kubernetes.io/name: workspaces-controller
app.kubernetes.io/name: workspace-controller
app.kubernetes.io/managed-by: kustomize
name: controller-manager-metrics-service
namespace: system
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
labels:
app.kubernetes.io/name: workspaces-controller
app.kubernetes.io/name: workspace-controller
app.kubernetes.io/managed-by: kustomize
name: leader-election-role
rules:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
labels:
app.kubernetes.io/name: workspaces-controller
app.kubernetes.io/name: workspace-controller
app.kubernetes.io/managed-by: kustomize
name: leader-election-rolebinding
roleRef:
Expand Down
2 changes: 1 addition & 1 deletion workspaces/controller/config/rbac/role_binding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
labels:
app.kubernetes.io/name: workspaces-controller
app.kubernetes.io/name: workspace-controller
app.kubernetes.io/managed-by: kustomize
name: manager-rolebinding
roleRef:
Expand Down
2 changes: 1 addition & 1 deletion workspaces/controller/config/rbac/service_account.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
kind: ServiceAccount
metadata:
labels:
app.kubernetes.io/name: workspaces-controller
app.kubernetes.io/name: workspace-controller
app.kubernetes.io/managed-by: kustomize
name: controller-manager
namespace: system
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
app.kubernetes.io/name: workspaces-controller
app.kubernetes.io/name: workspace-controller
app.kubernetes.io/managed-by: kustomize
name: workspace-editor-role
rules:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
app.kubernetes.io/name: workspaces-controller
app.kubernetes.io/name: workspace-controller
app.kubernetes.io/managed-by: kustomize
name: workspace-viewer-role
rules:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
app.kubernetes.io/name: workspaces-controller
app.kubernetes.io/name: workspace-controller
app.kubernetes.io/managed-by: kustomize
name: workspacekind-editor-role
rules:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
app.kubernetes.io/name: workspaces-controller
app.kubernetes.io/name: workspace-controller
app.kubernetes.io/managed-by: kustomize
name: workspacekind-viewer-role
rules:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: kubeflow.org/v1beta1
kind: Workspace
metadata:
labels:
app.kubernetes.io/name: workspaces-controller
app.kubernetes.io/name: workspace-controller
app.kubernetes.io/managed-by: kustomize
name: workspace-sample
spec:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: kubeflow.org/v1beta1
kind: WorkspaceKind
metadata:
labels:
app.kubernetes.io/name: workspaces-controller
app.kubernetes.io/name: workspace-controller
app.kubernetes.io/managed-by: kustomize
name: workspacekind-sample
spec:
Expand Down
2 changes: 1 addition & 1 deletion workspaces/controller/test/e2e/e2e_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ import (
// Run e2e tests using the Ginkgo runner.
func TestE2E(t *testing.T) {
RegisterFailHandler(Fail)
fmt.Fprintf(GinkgoWriter, "Starting workspaces-controller suite\n")
fmt.Fprintf(GinkgoWriter, "Starting workspace-controller suite\n")
RunSpecs(t, "e2e suite")
}
4 changes: 2 additions & 2 deletions workspaces/controller/test/e2e/e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/kubeflow/notebooks/workspaces/controller/test/utils"
)

const namespace = "workspaces-controller-system"
const namespace = "workspace-controller-system"

var _ = Describe("controller", Ordered, func() {
BeforeAll(func() {
Expand Down Expand Up @@ -60,7 +60,7 @@ var _ = Describe("controller", Ordered, func() {
var err error

// projectimage stores the name of the image used in the example
var projectimage = "example.com/workspaces-controller:v0.0.1"
var projectimage = "example.com/workspace-controller:v0.0.1"

By("building the manager(Operator) image")
cmd := exec.Command("make", "docker-build", fmt.Sprintf("IMG=%s", projectimage))
Expand Down

0 comments on commit 0886d6c

Please sign in to comment.