Misc fixes, subresource, samples, iam controller (#25)

IBM · Jun 10, 2019 · df4f3cd · df4f3cd
1 parent 8bdecb0
commit df4f3cd
Show file tree

Hide file tree

Showing 34 changed files with 434 additions and 114 deletions.
diff --git a/config/crds/ibmcloud_v1alpha1_binding.yaml b/config/crds/ibmcloud_v1alpha1_binding.yaml
@@ -18,6 +18,8 @@ spec:
     kind: Binding
     plural: bindings
   scope: Namespaced
+  subresources:
+    status: {}
   validation:
     openAPIV3Schema:
       properties:
@@ -41,7 +43,6 @@ spec:
               type: string
           required:
           - serviceName
-          - role
           type: object
         status:
           properties:

diff --git a/config/crds/ibmcloud_v1alpha1_service.yaml b/config/crds/ibmcloud_v1alpha1_service.yaml
@@ -18,6 +18,8 @@ spec:
     kind: Service
     plural: services
   scope: Namespaced
+  subresources:
+    status: {}
   validation:
     openAPIV3Schema:
       properties:
@@ -69,6 +71,8 @@ spec:
           type: object
         status:
           properties:
+            binding:
+              type: string
             context:
               properties:
                 org:

diff --git a/config/rbac/rbac_role.yaml b/config/rbac/rbac_role.yaml
@@ -28,6 +28,18 @@ rules:
   - update
   - patch
   - delete
+- apiGroups:
+  - ibmcloud.ibm.com
+  resources:
+  - services
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
 - apiGroups:
   - ""
   resources:
@@ -52,6 +64,18 @@ rules:
   - update
   - patch
   - delete
+- apiGroups:
+  - ibmcloud.ibm.com
+  resources:
+  - bindings/status
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
 - apiGroups:
   - ""
   resources:
@@ -244,6 +268,18 @@ rules:
   - update
   - patch
   - delete
+- apiGroups:
+  - ibmcloud.ibm.com
+  resources:
+  - services/status
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
 - apiGroups:
   - ""
   resources:

diff --git a/config/samples/apiconnect.yaml b/config/samples/apiconnect.yaml
@@ -0,0 +1,15 @@
+apiVersion: ibmcloud.ibm.com/v1alpha1
+kind: Service
+metadata:
+  name: myapiconnect
+spec:
+  plan: Lite
+  serviceClass: APIConnect
+  serviceClassType: CF
+---
+apiVersion: ibmcloud.ibm.com/v1alpha1
+kind: Binding
+metadata:
+  name: binding-apiconnect
+spec:
+  serviceName: myapiconnect
diff --git a/config/samples/appconnect.yaml b/config/samples/appconnect.yaml
@@ -0,0 +1,15 @@
+apiVersion: ibmcloud.ibm.com/v1alpha1
+kind: Service
+metadata:
+  name: myappconnect
+spec:
+  plan: Lite
+  serviceClass: AppConnect
+  serviceClassType: CF
+---
+apiVersion: ibmcloud.ibm.com/v1alpha1
+kind: Binding
+metadata:
+  name: binding-appconnect
+spec:
+  serviceName: myappconnect
diff --git a/config/samples/cloudant.yaml b/config/samples/cloudant.yaml
diff --git a/config/samples/translator.yaml → config/samples/group/appid.yaml b/config/samples/translator.yaml → config/samples/group/appid.yaml
@@ -1,15 +1,14 @@
 apiVersion: ibmcloud.ibm.com/v1alpha1
 kind: Service
 metadata:
-  name: mytranslator
+  name: myappid
 spec:
   plan: lite
-  serviceClass: language-translator
+  serviceClass: appid
 ---
 apiVersion: ibmcloud.ibm.com/v1alpha1
 kind: Binding
 metadata:
-  name: binding-translator
+  name: binding-appid
 spec:
-  serviceName: mytranslator
-  role: Manager
+  serviceName: myappid
diff --git a/config/samples/group/applaunch.yaml b/config/samples/group/applaunch.yaml
@@ -0,0 +1,14 @@
+apiVersion: ibmcloud.ibm.com/v1alpha1
+kind: Service
+metadata:
+  name: myapplaunch
+spec:
+  plan: beta
+  serviceClass: applaunch
+---
+apiVersion: ibmcloud.ibm.com/v1alpha1
+kind: Binding
+metadata:
+  name: binding-applaunch
+spec:
+  serviceName: myapplaunch
diff --git a/config/samples/group/cloudant.yaml b/config/samples/group/cloudant.yaml
@@ -0,0 +1,14 @@
+apiVersion: ibmcloud.ibm.com/v1alpha1
+kind: Service
+metadata:
+  name: mycloudant
+spec:
+  plan: lite
+  serviceClass: cloudantnosqldb
+---
+apiVersion: ibmcloud.ibm.com/v1alpha1
+kind: Binding
+metadata:
+  name: binding-cloudant
+spec:
+  serviceName: mycloudant
diff --git a/config/samples/group/contdelivery.yaml b/config/samples/group/contdelivery.yaml
@@ -0,0 +1,14 @@
+apiVersion: ibmcloud.ibm.com/v1alpha1
+kind: Service
+metadata:
+  name: mydelivery
+spec:
+  plan: lite
+  serviceClass: continuous-delivery
+---
+apiVersion: ibmcloud.ibm.com/v1alpha1
+kind: Binding
+metadata:
+  name: binding-delivery
+spec:
+  serviceName: mydelivery
diff --git a/config/samples/group/cos.yaml b/config/samples/group/cos.yaml
@@ -0,0 +1,20 @@
+apiVersion: ibmcloud.ibm.com/v1alpha1
+kind: Service
+metadata:
+  name: mycos
+spec:
+  plan: lite
+  serviceClass: cloud-object-storage
+  context:
+    org: [email protected]
+    region: global
+    space: dev
+    resourcegroup: default
+    resourcelocation: global
+---
+apiVersion: ibmcloud.ibm.com/v1alpha1
+kind: Binding
+metadata:
+  name: binding-mycos
+spec:
+  serviceName: mycos
diff --git a/config/samples/group/db2.yaml b/config/samples/group/db2.yaml
@@ -0,0 +1,15 @@
+apiVersion: ibmcloud.ibm.com/v1alpha1
+kind: Service
+metadata:
+  name: mydb2
+spec:
+  plan: Entry
+  serviceClass: dashDB
+  serviceClassType: CF
+---
+apiVersion: ibmcloud.ibm.com/v1alpha1
+kind: Binding
+metadata:
+  name: binding-db2
+spec:
+  serviceName: mydb2
diff --git a/config/samples/elastic.yaml → config/samples/group/elastic.yaml b/config/samples/elastic.yaml → config/samples/group/elastic.yaml
diff --git a/config/samples/group/etcd.yaml b/config/samples/group/etcd.yaml
@@ -0,0 +1,14 @@
+apiVersion: ibmcloud.ibm.com/v1alpha1
+kind: Service
+metadata:
+  name: myetcd
+spec:
+  plan: standard
+  serviceClass: databases-for-etcd
+---
+apiVersion: ibmcloud.ibm.com/v1alpha1
+kind: Binding
+metadata:
+  name: binding-etcd
+spec:
+  serviceName: myetcd
diff --git a/config/samples/geo.yaml → config/samples/group/geo.yaml b/config/samples/geo.yaml → config/samples/group/geo.yaml
@@ -6,3 +6,10 @@ spec:
   plan: Standard
   serviceClass: Geospatial Analytics
   serviceClassType: CF
+---
+apiVersion: ibmcloud.ibm.com/v1alpha1
+kind: Binding
+metadata:
+  name: binding-geo
+spec:
+  serviceName: mygeo
diff --git a/config/samples/group/iot.yaml b/config/samples/group/iot.yaml
@@ -0,0 +1,15 @@
+apiVersion: ibmcloud.ibm.com/v1alpha1
+kind: Service
+metadata:
+  name: myiot
+spec:
+  plan: iotf-service-free
+  serviceClass: iotf-service
+  serviceClassType: CF
+---
+apiVersion: ibmcloud.ibm.com/v1alpha1
+kind: Binding
+metadata:
+  name: binding-iot
+spec:
+  serviceName: myiot
diff --git a/config/samples/group/keyprotect.yaml b/config/samples/group/keyprotect.yaml
@@ -0,0 +1,14 @@
+apiVersion: ibmcloud.ibm.com/v1alpha1
+kind: Service
+metadata:
+  name: mykeyprotect
+spec:
+  plan: tiered-pricing
+  serviceClass: kms
+---
+apiVersion: ibmcloud.ibm.com/v1alpha1
+kind: Binding
+metadata:
+  name: binding-keyprotect
+spec:
+  serviceName: mykeyprotect
diff --git a/config/samples/group/knowledge.yaml b/config/samples/group/knowledge.yaml
@@ -0,0 +1,14 @@
+apiVersion: ibmcloud.ibm.com/v1alpha1
+kind: Service
+metadata:
+  name: myknowledgestudio
+spec:
+  plan: free
+  serviceClass: knowledge-studio
+---
+apiVersion: ibmcloud.ibm.com/v1alpha1
+kind: Binding
+metadata:
+  name: binding-knowledge
+spec:
+  serviceName: myknowledgestudio
diff --git a/config/samples/messagehub.yaml → config/samples/group/messagehub.yaml b/config/samples/messagehub.yaml → config/samples/group/messagehub.yaml
diff --git a/config/samples/group/messagehubCF.yaml b/config/samples/group/messagehubCF.yaml
@@ -0,0 +1,15 @@
+apiVersion: ibmcloud.ibm.com/v1alpha1
+kind: Service
+metadata:
+  name: mymessagehubcf
+spec:
+  plan: standard
+  serviceClass: messagehub
+  serviceClassType: CF
+---
+apiVersion: ibmcloud.ibm.com/v1alpha1
+kind: Binding
+metadata:
+  name: binding-messagehubcf
+spec:
+  serviceName: mymessagehubcf
diff --git a/config/samples/group/mq.yaml b/config/samples/group/mq.yaml
@@ -0,0 +1,14 @@
+apiVersion: ibmcloud.ibm.com/v1alpha1
+kind: Service
+metadata:
+  name: mymq
+spec:
+  plan: lite
+  serviceClass: mqcloud
+---
+apiVersion: ibmcloud.ibm.com/v1alpha1
+kind: Binding
+metadata:
+  name: binding-mq
+spec:
+  serviceName: mymq
diff --git a/config/samples/group/personality.yaml b/config/samples/group/personality.yaml
@@ -0,0 +1,14 @@
+apiVersion: ibmcloud.ibm.com/v1alpha1
+kind: Service
+metadata:
+  name: mypersonality
+spec:
+  plan: lite
+  serviceClass: personality-insights
+---
+apiVersion: ibmcloud.ibm.com/v1alpha1
+kind: Binding
+metadata:
+  name: binding-personality
+spec:
+  serviceName: mypersonality
diff --git a/config/samples/group/postgresql.yaml b/config/samples/group/postgresql.yaml
@@ -0,0 +1,14 @@
+apiVersion: ibmcloud.ibm.com/v1alpha1
+kind: Service
+metadata:
+  name: mypostgresql
+spec:
+  plan: standard
+  serviceClass: databases-for-postgresql
+---
+apiVersion: ibmcloud.ibm.com/v1alpha1
+kind: Binding
+metadata:
+  name: binding-postgresql
+spec:
+  serviceName: mypostgresql