Merge pull request #8 from DoodleScheduling/tidy

tidy & cleanup

Author: raffis

api/v1beta1/mongodbdatabase_types.go

@@ -34,7 +34,7 @@ func (in *MongoDBDatabase) GetStatusConditions() *[]metav1.Condition {
 // MongoDBDatabaseStatus defines the observed state of MongoDBDatabase
 // IMPORTANT: Run "make" to regenerate code after modifying this file
 type MongoDBDatabaseStatus struct {
-	// Conditions holds the conditions for the VaultBinding.
+	// Conditions holds the conditions for the MongoDBDatabase.
 	// +optional
 	Conditions []metav1.Condition `json:"conditions,omitempty"`
 }

api/v1beta1/mongodbuser_type.go

@@ -52,7 +52,7 @@ func (in *MongoDBUser) GetStatusConditions() *[]metav1.Condition {
 // MongoDBUserStatus defines the observed state of MongoDBUser
 // IMPORTANT: Run "make" to regenerate code after modifying this file
 type MongoDBUserStatus struct {
-	// Conditions holds the conditions for the VaultBinding.
+	// Conditions holds the conditions for the MongoDBUser.
 	// +optional
 	Conditions []metav1.Condition `json:"conditions,omitempty"`
 }

api/v1beta1/postgresqldatabase_types.go

@@ -34,7 +34,7 @@ func (in *PostgreSQLDatabase) GetStatusConditions() *[]metav1.Condition {
 // PostgreSQLDatabaseStatus defines the observed state of PostgreSQLDatabase
 // IMPORTANT: Run "make" to regenerate code after modifying this file
 type PostgreSQLDatabaseStatus struct {
-	// Conditions holds the conditions for the VaultBinding.
+	// Conditions holds the conditions for the PostgreSQLDatabase.
 	// +optional
 	Conditions []metav1.Condition `json:"conditions,omitempty"`
 }

api/v1beta1/postgresqluser_type.go

@@ -34,7 +34,7 @@ func (in *PostgreSQLUser) GetStatusConditions() *[]metav1.Condition {
 // PostgreSQLUserStatus defines the observed state of PostgreSQLUser
 // IMPORTANT: Run "make" to regenerate code after modifying this file
 type PostgreSQLUserStatus struct {
-	// Conditions holds the conditions for the VaultBinding.
+	// Conditions holds the conditions for the PostgreSQLUser.
 	// +optional
 	Conditions []metav1.Condition `json:"conditions,omitempty"`
 }

chart/k8sdb-controller/Chart.yaml

@@ -6,7 +6,6 @@ keywords:
 - kubernetes-controller
 - mongodb
 - postgresql
-- vault
 name: k8sdb-controller
 sources:
 - https://github.com/DoodleScheduling/k8sdb-controller

config/crd/bases/dbprovisioning.infra.doodle.com_mongodbdatabases.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.2.5
   creationTimestamp: null
   name: mongodbdatabases.dbprovisioning.infra.doodle.com
 spec:
@@ -91,7 +91,7 @@ spec:
               IMPORTANT: Run "make" to regenerate code after modifying this file'
             properties:
               conditions:
-                description: Conditions holds the conditions for the VaultBinding.
+                description: Conditions holds the conditions for the MongoDBDatabase.
                 items:
                   description: "Condition contains details for one aspect of the current
                     state of this API Resource. --- This struct is intended for direct

config/crd/bases/dbprovisioning.infra.doodle.com_mongodbusers.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.2.5
   creationTimestamp: null
   name: mongodbusers.dbprovisioning.infra.doodle.com
 spec:
@@ -84,7 +84,7 @@ spec:
               IMPORTANT: Run "make" to regenerate code after modifying this file'
             properties:
               conditions:
-                description: Conditions holds the conditions for the VaultBinding.
+                description: Conditions holds the conditions for the MongoDBUser.
                 items:
                   description: "Condition contains details for one aspect of the current
                     state of this API Resource. --- This struct is intended for direct

config/crd/bases/dbprovisioning.infra.doodle.com_postgresqldatabases.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.2.5
   creationTimestamp: null
   name: postgresqldatabases.dbprovisioning.infra.doodle.com
 spec:
@@ -91,7 +91,7 @@ spec:
               IMPORTANT: Run "make" to regenerate code after modifying this file'
             properties:
               conditions:
-                description: Conditions holds the conditions for the VaultBinding.
+                description: Conditions holds the conditions for the PostgreSQLDatabase.
                 items:
                   description: "Condition contains details for one aspect of the current
                     state of this API Resource. --- This struct is intended for direct

config/crd/bases/dbprovisioning.infra.doodle.com_postgresqlusers.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.2.5
   creationTimestamp: null
   name: postgresqlusers.dbprovisioning.infra.doodle.com
 spec:
@@ -84,7 +84,7 @@ spec:
               IMPORTANT: Run "make" to regenerate code after modifying this file'
             properties:
               conditions:
-                description: Conditions holds the conditions for the VaultBinding.
+                description: Conditions holds the conditions for the PostgreSQLUser.
                 items:
                   description: "Condition contains details for one aspect of the current
                     state of this API Resource. --- This struct is intended for direct

go.mod

@@ -3,32 +3,20 @@ module github.com/doodlescheduling/k8sdb-controller
 go 1.13
 
 require (
-	github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6 // indirect
-	github.com/coreos/go-etcd v2.0.0+incompatible // indirect
 	github.com/go-logr/logr v0.3.0
 	github.com/golang/snappy v0.0.2 // indirect
-	github.com/gordonklaus/ineffassign v0.0.0-20210209182638-d0e41b2fc8ed // indirect
-	github.com/hashicorp/errwrap v1.1.0
-	github.com/hashicorp/vault/api v1.0.4
 	github.com/jackc/pgx/v4 v4.10.1
-	github.com/mdempsky/unconvert v0.0.0-20200228143138-95ecdbfc0b5f // indirect
 	github.com/onsi/ginkgo v1.14.1
 	github.com/onsi/gomega v1.10.2
-	github.com/opennota/check v0.0.0-20180911053232-0c771f5545ff // indirect
 	github.com/prometheus/common v0.10.0
-	github.com/rs/xid v1.2.1
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.7.0
-	github.com/stripe/safesql v0.2.0 // indirect
-	github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8 // indirect
-	github.com/walle/lll v1.0.1 // indirect
 	github.com/xdg/stringprep v1.0.0 // indirect
-	github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77 // indirect
 	go.mongodb.org/mongo-driver v1.4.4
+	golang.org/x/tools v0.1.0 // indirect
 	k8s.io/api v0.20.2
-	k8s.io/apiextensions-apiserver v0.20.2
+	k8s.io/apiextensions-apiserver v0.20.2 // indirect
 	k8s.io/apimachinery v0.20.2
-	k8s.io/cli-runtime v0.20.2
 	k8s.io/client-go v0.20.2
 	sigs.k8s.io/controller-runtime v0.8.0
 )