Skip to content

Commit 83f589a

Browse files
committed
deploy: restore namespace handling in fullstack overlay
This patch removes hard-coded namespaces from the `base` layer, then creates the `objectstorage-system` and `objectstorage-provisioner-ns` Namespaces in the `fullstack` overlay, and uses them accordingly. Closes: kubernetes-retired/container-object-storage-interface-controller#22
1 parent 87fea9a commit 83f589a

File tree

9 files changed

+30
-37
lines changed

9 files changed

+30
-37
lines changed

Diff for: container-object-storage-interface-controller/deploy/base/deployment.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ kind: Deployment
33
apiVersion: apps/v1
44
metadata:
55
name: objectstorage-controller
6-
namespace: objectstorage-system
76
labels:
87
app.kubernetes.io/part-of: container-object-storage-interface
98
app.kubernetes.io/component: controller

Diff for: container-object-storage-interface-controller/deploy/base/kustomization.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ resources:
1111
- https://raw.githubusercontent.com/kubernetes-sigs/container-object-storage-interface-api/master/crds/objectstorage.k8s.io_bucketrequests.yaml
1212
- https://raw.githubusercontent.com/kubernetes-sigs/container-object-storage-interface-api/master/crds/objectstorage.k8s.io_buckets.yaml
1313
# Controller
14-
- ns.yaml
1514
- sa.yaml
1615
- rbac.yaml
1716
- deployment.yaml

Diff for: container-object-storage-interface-controller/deploy/base/rbac.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ metadata:
3434
subjects:
3535
- kind: ServiceAccount
3636
name: objectstorage-controller-sa
37-
namespace: objectstorage-system
3837
roleRef:
3938
kind: ClusterRole
4039
name: objectstorage-controller-role
@@ -44,7 +43,6 @@ kind: Role
4443
apiVersion: rbac.authorization.k8s.io/v1
4544
metadata:
4645
name: objectstorage-controller
47-
namespace: objectstorage-system
4846
labels:
4947
app.kubernetes.io/part-of: container-object-storage-interface
5048
app.kubernetes.io/component: controller
@@ -59,7 +57,6 @@ kind: RoleBinding
5957
apiVersion: rbac.authorization.k8s.io/v1
6058
metadata:
6159
name: objectstorage-controller
62-
namespace: objectstorage-system
6360
labels:
6461
app.kubernetes.io/part-of: container-object-storage-interface
6562
app.kubernetes.io/component: controller
@@ -68,7 +65,6 @@ metadata:
6865
subjects:
6966
- kind: ServiceAccount
7067
name: objectstorage-controller-sa
71-
namespace: objectstorage-system
7268
roleRef:
7369
kind: Role
7470
name: objectstorage-controller

Diff for: container-object-storage-interface-controller/deploy/base/sa.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ apiVersion: v1
33
kind: ServiceAccount
44
metadata:
55
name: objectstorage-controller-sa
6-
namespace: objectstorage-system
76
labels:
87
app.kubernetes.io/part-of: container-object-storage-interface
98
app.kubernetes.io/component: controller
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
apiVersion: kustomize.config.k8s.io/v1beta1
3+
kind: Kustomization
4+
5+
namespace: objectstorage-system
6+
7+
bases:
8+
- ../../base/
9+
10+
resources:
11+
# Namespace
12+
- ns.yaml

Diff for: container-object-storage-interface-controller/deploy/fullstack/kustomization.yaml

+2-30
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
33
kind: Kustomization
44

55
bases:
6-
- ../base/
7-
8-
resources:
9-
# Sidecar
10-
- https://raw.githubusercontent.com/container-object-storage-interface/cosi-provisioner-sidecar/master/examples/object-storage-sidecar.yaml
11-
12-
patches:
13-
# Sidecar
14-
- target:
15-
kind: Deployment
16-
name: object-storage-provisioner
17-
patch: |-
18-
- op: replace
19-
path: /metadata
20-
value:
21-
name: object-storage-provisioner
22-
labels:
23-
app: object-storage-provisioner
24-
namespace: objectstorage-provisioner-ns
25-
- target:
26-
kind: Secret
27-
name: object-storage-provisioner
28-
patch: |-
29-
- op: replace
30-
path: /metadata
31-
value:
32-
name: object-storage-provisioner
33-
labels:
34-
app: object-storage-provisioner
35-
namespace: objectstorage-provisioner-ns
6+
- ./controller
7+
- ./provisioner
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
apiVersion: kustomize.config.k8s.io/v1beta1
3+
kind: Kustomization
4+
5+
namespace: objectstorage-provisioner-ns
6+
7+
resources:
8+
# Namespace
9+
- ns.yaml
10+
# Sidecar
11+
- https://raw.githubusercontent.com/container-object-storage-interface/cosi-provisioner-sidecar/master/examples/object-storage-sidecar.yaml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
apiVersion: v1
3+
kind: Namespace
4+
metadata:
5+
name: objectstorage-provisioner-ns

0 commit comments

Comments
 (0)