Skip to content

Commit

Permalink
fix(manifests): Include ServiceAccount in namespace scoped install (#240
Browse files Browse the repository at this point in the history
)

Signed-off-by: Derek Wang <[email protected]>
  • Loading branch information
whynowy committed Oct 27, 2022
1 parent fe83918 commit 9684e16
Show file tree
Hide file tree
Showing 13 changed files with 15 additions and 27 deletions.
9 changes: 5 additions & 4 deletions config/advanced-install/namespaced-controller-wo-crds.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: numaflow-sa
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: numaflow-role
namespace: numaflow-system
rules:
- apiGroups:
- numaflow.numaproj.io
Expand Down Expand Up @@ -73,7 +77,6 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: numaflow-role-binding
namespace: numaflow-system
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
Expand Down Expand Up @@ -190,13 +193,11 @@ data:
kind: ConfigMap
metadata:
name: numaflow-controller-config
namespace: numaflow-system
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: numaflow-controller
namespace: numaflow-system
spec:
replicas: 1
selector:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ resources:
- ../../base/controller-manager
- ../../namespace-install/rbac/controller-manager

namespace: numaflow-system

images:
- name: quay.io/numaproj/numaflow
newTag: v0.6.0
Expand Down
6 changes: 6 additions & 0 deletions config/advanced-install/numaflow-server.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: numaflow-server-sa
namespace: numaflow-system
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
Expand Down
1 change: 1 addition & 0 deletions config/base/controller-manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

resources:
- numaflow-sa.yaml
- numaflow-controller-config.yaml
- controller-manager-deployment.yaml
File renamed without changes.
2 changes: 0 additions & 2 deletions config/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ kind: Kustomization

resources:
- crds/full
- numaflow-sa.yaml
- numaflow-server-sa.yaml
- controller-manager
- numaflow-server

Expand Down
3 changes: 2 additions & 1 deletion config/base/numaflow-server/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

resources:
- numaflow-server-sa.yaml
- numaflow-server-deployment.yaml
- numaflow-server-service.yaml
- numaflow-server-service.yaml
File renamed without changes.
12 changes: 0 additions & 12 deletions config/namespace-install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12614,19 +12614,16 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: numaflow-sa
namespace: numaflow-system
---
apiVersion: v1
kind: ServiceAccount
metadata:
name: numaflow-server-sa
namespace: numaflow-system
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: numaflow-role
namespace: numaflow-system
rules:
- apiGroups:
- numaflow.numaproj.io
Expand Down Expand Up @@ -12697,7 +12694,6 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: numaflow-server-role
namespace: numaflow-system
rules:
- apiGroups:
- numaflow.numaproj.io
Expand Down Expand Up @@ -12751,29 +12747,25 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: numaflow-role-binding
namespace: numaflow-system
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: numaflow-role
subjects:
- kind: ServiceAccount
name: numaflow-sa
namespace: numaflow-system
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: numaflow-server-binding
namespace: numaflow-system
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: numaflow-server-role
subjects:
- kind: ServiceAccount
name: numaflow-server-sa
namespace: numaflow-system
---
apiVersion: v1
data:
Expand Down Expand Up @@ -12883,13 +12875,11 @@ data:
kind: ConfigMap
metadata:
name: numaflow-controller-config
namespace: numaflow-system
---
apiVersion: v1
kind: Service
metadata:
name: numaflow-server
namespace: numaflow-system
spec:
ports:
- port: 8443
Expand All @@ -12903,7 +12893,6 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: numaflow-controller
namespace: numaflow-system
spec:
replicas: 1
selector:
Expand Down Expand Up @@ -12965,7 +12954,6 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: numaflow-server
namespace: numaflow-system
spec:
replicas: 1
selector:
Expand Down
2 changes: 0 additions & 2 deletions config/namespace-install/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ resources:
- ../base
- rbac

namespace: numaflow-system

patches:
- patch: |-
- op: add
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@ roleRef:
subjects:
- kind: ServiceAccount
name: numaflow-server-sa
namespace: numaflow-system
2 changes: 0 additions & 2 deletions docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ resources:
namespace: numaflow-system
```
**Note**: Currently namespace scoped installaion only applies to the controller deployment, the `numaflow-server` (User Interface) deployment still remains cluster scoped installation.

## Managed Namespace Scope
A managed namespace installation watches and executes pipelines in a specific namespace.
Expand Down
2 changes: 1 addition & 1 deletion mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,4 @@ nav:
- debugging.md
- static-code-analysis.md
- releasing.md
- Numaproj: https://www.numaproj.io
- Numaproj: https://numaproj.io

0 comments on commit 9684e16

Please sign in to comment.