Add support for AWS RDS and GCP CloudSQL

Signed-off-by: Jared Watts <jbw976@gmail.com>

Gopkg.toml

@@ -1,7 +1,10 @@
 required = [
+    "github.com/aws/aws-sdk-go-v2",
     "github.com/emicklei/go-restful",
     "github.com/onsi/ginkgo", # for test framework
     "github.com/onsi/gomega", # for test matchers
+    "google.golang.org/api/sqladmin/v1beta4",
+    "golang.org/x/oauth2/google",
     "k8s.io/client-go/plugin/pkg/client/auth/gcp", # for development against gcp
     "k8s.io/code-generator/cmd/deepcopy-gen", # for go generate
     "sigs.k8s.io/controller-tools/cmd/controller-gen", # for crd/rbac generation
@@ -12,12 +15,15 @@ required = [
     "sigs.k8s.io/controller-runtime/pkg/runtime/signals",
     "sigs.k8s.io/controller-runtime/pkg/source",
     "sigs.k8s.io/testing_frameworks/integration", # for integration testing
-	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1",
+  	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1",
     ]
 
 [prune]
   go-tests = true
 
+[[constraint]]
+  name = "github.com/aws/aws-sdk-go-v2"
+  version = "v2.0.0-preview.4"
 
 # STANZAS BELOW ARE GENERATED AND MAY BE WRITTEN - DO NOT MODIFY BELOW THIS LINE.
 

README.md

@@ -30,8 +30,10 @@ More details about API versioning and status in Kubernetes can be found on the K
 * **Stable:** Features will appear in released software for many subsequent versions and support for upgrading between versions will be provided with software automation in the vast majority of scenarios.
 
 
-Name | Details | API Group | Status
------|---------|-----------|-------
+| Name | Details | API Group | Status |
+| ----- | --------- | ----------- | -------- |
+| AWS Database | Database storage services in AWS | database.aws.conductor.io/v1alpha1 | Alpha |
+| GCP Database | Database storage services in GCP | database.gcp.conductor.io/v1alpha1 | Alpha |
 
 ### Official Releases
 

cluster/charts/conductor/crds/aws/database/v1alpha1/rdsinstance.yaml

@@ -20,8 +20,47 @@ spec:
         metadata:
           type: object
         spec:
+          properties:
+            backupretentionperiod:
+              format: int64
+              type: integer
+            class:
+              type: string
+            encrypted:
+              type: boolean
+            engine:
+              type: string
+            iops:
+              format: int64
+              type: integer
+            masterPasswordSecretRef:
+              type: object
+            masterUsername:
+              type: string
+            multiaz:
+              type: boolean
+            publicaccess:
+              type: boolean
+            size:
+              format: int64
+              type: integer
+            storagetype:
+              type: string
+          required:
+          - masterUsername
+          - masterPasswordSecretRef
+          - engine
+          - class
+          - size
           type: object
         status:
+          properties:
+            message:
+              type: string
+            providerID:
+              type: string
+            state:
+              type: string
           type: object
   version: v1alpha1
 status:

cluster/charts/conductor/crds/gcp/database/v1alpha1/cloudsqlinstance.yaml

@@ -21,8 +21,32 @@ spec:
         metadata:
           type: object
         spec:
+          properties:
+            databaseVersion:
+              type: string
+            projectID:
+              type: string
+            region:
+              type: string
+            storageType:
+              type: string
+            tier:
+              type: string
+          required:
+          - projectID
+          - tier
+          - region
+          - databaseVersion
+          - storageType
           type: object
         status:
+          properties:
+            message:
+              type: string
+            providerID:
+              type: string
+            state:
+              type: string
           type: object
   version: v1alpha1
 status:

cluster/charts/conductor/templates/clusterrole.yaml

@@ -9,29 +9,19 @@ metadata:
     heritage: {{ .Release.Service }}
 rules:
 - apiGroups:
-  - apps
+  - ""
   resources:
-  - deployments
+  - nodes
   verbs:
   - get
   - list
   - watch
-  - create
-  - update
-  - patch
-  - delete
 - apiGroups:
-  - rds.aws.conductor.io
+  - ""
   resources:
-  - instances
+  - secrets
   verbs:
   - get
-  - list
-  - watch
-  - create
-  - update
-  - patch
-  - delete
 - apiGroups:
   - apps
   resources:
@@ -45,14 +35,14 @@ rules:
   - patch
   - delete
 - apiGroups:
-  - cloudsql.gcp.conductor.io
+  - database.aws.conductor.io
   resources:
-  - instances
+  - "*"
   verbs:
-  - get
-  - list
-  - watch
-  - create
-  - update
-  - patch
-  - delete
+  - "*"
+- apiGroups:
+  - database.gcp.conductor.io
+  resources:
+  - "*"
+  verbs:
+  - "*"

cluster/charts/conductor/templates/clusterrolebinding.yaml

@@ -1,23 +1,5 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
-metadata:
-  name: {{ template "name" . }}-admin
-  labels:
-    app: {{ template "name" . }}
-    chart: {{ template "chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: cluster-admin
-subjects:
-- kind: ServiceAccount
-  name: {{ template "name" . }}
-  namespace: {{ .Release.Namespace }}
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
 metadata:
   name: {{ template "name" . }}
   labels:

cluster/charts/conductor/templates/deployment.yaml

@@ -33,3 +33,9 @@ spec:
           requests:
             cpu: 100m
             memory: 20Mi
+        env:
+        # The pod namespace to pass with the downward API
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace

cluster/examples/aws/database/v1alpha1/rdsinstance.yaml

@@ -0,0 +1,25 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: rds-secret
+type: Opaque
+data:
+  rdsPassword: cGFzc3dvcmRvcnNvbWV0aGluZw==
+---
+apiVersion: database.aws.conductor.io/v1alpha1
+kind: RDSInstance
+metadata:
+  name: rdssample
+spec:
+  class: db.t2.small # type of the db instance
+  engine: postgres # what engine to use postgres, mysql, aurora-postgresql etc.
+  masterUsername: postgres # Database username
+  masterPasswordSecretRef: # reference to secret that contains database master password
+    name: rds-secret # the name of the secret
+    key: rdsPassword # the name of the key in the secret data that contains the password
+  size: 10 # size in GB of underlying storage volume
+  storagetype: gp2 # type of the underlying storage
+  backupretentionperiod: 10 # days to keep backup, 0 means diable
+  encrypted: true # should the database be encrypted
+  #iops: 1000 # number of iops
+  multiaz: true # multi AZ support

cluster/examples/gcp/database/v1alpha1/cloudsqlinstance.yaml

@@ -0,0 +1,11 @@
+apiVersion: database.gcp.conductor.io/v1alpha1
+kind: CloudsqlInstance
+metadata:
+  labels:
+  name: cloudsql-sample-01398
+spec:
+  projectID: long-disk-191221
+  tier: db-n1-standard-1
+  region: us-west2
+  databaseVersion: MYSQL_5_7
+  storageType: PD_SSD

cmd/conductor/main.go

@@ -63,7 +63,7 @@ func main() {
 		log.Fatal(err)
 	}
 
-	log.Printf("Starting the Cmd.")
+	log.Printf("Starting the manager.")
 
 	// Start the Cmd
 	log.Fatal(mgr.Start(signals.SetupSignalHandler()))

docs/README.md

@@ -0,0 +1,3 @@
+# User Guides
+
+* [Troubleshooting](troubleshooting.md)