Merge pull request kubernetes-retired#26 from NicolasT/refactor-kusto…

…mize-deployment

Refactor Kustomize deployment

deploy/base/deployment.yaml

@@ -3,7 +3,11 @@ kind: Deployment
 apiVersion: apps/v1
 metadata:
   name: objectstorage-controller
-  namespace: objectstorage-system
+  labels:
+    app.kubernetes.io/part-of: container-object-storage-interface
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/version: main
+    app.kubernetes.io/name: container-object-storage-interface-controller
 spec:
   replicas: 1
   strategy:
@@ -12,11 +16,16 @@ spec:
       maxSurge: 1
   selector:
     matchLabels:
-      app: objectstorage-controller
+      app.kubernetes.io/part-of: container-object-storage-interface
+      app.kubernetes.io/component: controller
+      app.kubernetes.io/name: container-object-storage-interface-controller
   template:
     metadata:
       labels:
-        app: objectstorage-controller
+        app.kubernetes.io/part-of: container-object-storage-interface
+        app.kubernetes.io/component: controller
+        app.kubernetes.io/version: main
+        app.kubernetes.io/name: container-object-storage-interface-controller
     spec:
       serviceAccountName: objectstorage-controller-sa
       containers:

deploy/base/kustomization.yaml

@@ -0,0 +1,27 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+# CRDs
+- https://raw.githubusercontent.com/kubernetes-sigs/container-object-storage-interface-api/master/crds/objectstorage.k8s.io_bucketaccessclasses.yaml
+- https://raw.githubusercontent.com/kubernetes-sigs/container-object-storage-interface-api/master/crds/objectstorage.k8s.io_bucketaccesses.yaml
+- https://raw.githubusercontent.com/kubernetes-sigs/container-object-storage-interface-api/master/crds/objectstorage.k8s.io_bucketaccessrequests.yaml
+- https://raw.githubusercontent.com/kubernetes-sigs/container-object-storage-interface-api/master/crds/objectstorage.k8s.io_bucketclasses.yaml
+- https://raw.githubusercontent.com/kubernetes-sigs/container-object-storage-interface-api/master/crds/objectstorage.k8s.io_bucketrequests.yaml
+- https://raw.githubusercontent.com/kubernetes-sigs/container-object-storage-interface-api/master/crds/objectstorage.k8s.io_buckets.yaml
+# Controller
+- sa.yaml
+- rbac.yaml
+- deployment.yaml
+
+patches:
+# CRDs
+- target:
+    kind: CustomResourceDefinition
+  patch: |-
+    - op: add
+      path: /metadata/annotations
+      value:
+        controller-gen.kubebuilder.io/version: (devel)
+        api-approved.kubernetes.io: https://github.com/kubernetes-sigs/container-object-storage-interface-api/pull/2

deploy/base/rbac.yaml

@@ -3,6 +3,11 @@ kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: objectstorage-controller-role
+  labels:
+    app.kubernetes.io/part-of: container-object-storage-interface
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/version: main
+    app.kubernetes.io/name: container-object-storage-interface-controller
 rules:
 - apiGroups: ["objectstorage.k8s.io"]
   resources: ["bucketrequests", "bucketaccessrequests"]
@@ -21,10 +26,14 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: system:objectstorage-controller
+  labels:
+    app.kubernetes.io/part-of: container-object-storage-interface
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/version: main
+    app.kubernetes.io/name: container-object-storage-interface-controller
 subjects:
   - kind: ServiceAccount
     name: objectstorage-controller-sa
-    namespace: objectstorage-system
 roleRef:
   kind: ClusterRole
   name: objectstorage-controller-role
@@ -34,7 +43,11 @@ kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: objectstorage-controller
-  namespace: objectstorage-system
+  labels:
+    app.kubernetes.io/part-of: container-object-storage-interface
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/version: main
+    app.kubernetes.io/name: container-object-storage-interface-controller
 rules:
 - apiGroups: ["coordination.k8s.io"]
   resources: ["leases"]
@@ -44,11 +57,14 @@ kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: objectstorage-controller
-  namespace: objectstorage-system
+  labels:
+    app.kubernetes.io/part-of: container-object-storage-interface
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/version: main
+    app.kubernetes.io/name: container-object-storage-interface-controller
 subjects:
   - kind: ServiceAccount
     name: objectstorage-controller-sa
-    namespace: objectstorage-system
 roleRef:
   kind: Role
   name: objectstorage-controller

deploy/base/sa.yaml

@@ -3,4 +3,8 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: objectstorage-controller-sa
-  namespace: objectstorage-system
+  labels:
+    app.kubernetes.io/part-of: container-object-storage-interface
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/version: main
+    app.kubernetes.io/name: container-object-storage-interface-controller

deploy/fullstack/controller/kustomization.yaml

@@ -0,0 +1,12 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namespace: objectstorage-system
+
+bases:
+- ../../base/
+
+resources:
+# Namespace
+- ns.yaml

deploy/fullstack/kustomization.yaml

@@ -0,0 +1,7 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+bases:
+- ./controller
+- ./provisioner

deploy/fullstack/provisioner/kustomization.yaml

@@ -0,0 +1,11 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namespace: objectstorage-provisioner-ns
+
+resources:
+# Namespace
+- ns.yaml
+# Sidecar
+- https://raw.githubusercontent.com/container-object-storage-interface/cosi-provisioner-sidecar/master/examples/object-storage-sidecar.yaml

deploy/fullstack/provisioner/ns.yaml

@@ -0,0 +1,5 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: objectstorage-provisioner-ns