Add table instance as owner of migration object

schemahero · Apr 5, 2020 · 1994544 · 1994544
1 parent 0ec3dfe
commit 1994544
Show file tree

Hide file tree

Showing 28 changed files with 63 additions and 35 deletions.
diff --git a/pkg/apis/databases/v1alpha3/zz_generated.deepcopy.go b/pkg/apis/databases/v1alpha3/zz_generated.deepcopy.go
diff --git a/pkg/apis/schemas/v1alpha3/zz_generated.deepcopy.go b/pkg/apis/schemas/v1alpha3/zz_generated.deepcopy.go
diff --git a/pkg/client/schemaheroclientset/clientset.go b/pkg/client/schemaheroclientset/clientset.go
diff --git a/pkg/client/schemaheroclientset/doc.go b/pkg/client/schemaheroclientset/doc.go
diff --git a/pkg/client/schemaheroclientset/fake/clientset_generated.go b/pkg/client/schemaheroclientset/fake/clientset_generated.go
diff --git a/pkg/client/schemaheroclientset/fake/doc.go b/pkg/client/schemaheroclientset/fake/doc.go
diff --git a/pkg/client/schemaheroclientset/fake/register.go b/pkg/client/schemaheroclientset/fake/register.go
diff --git a/pkg/client/schemaheroclientset/scheme/doc.go b/pkg/client/schemaheroclientset/scheme/doc.go
diff --git a/pkg/client/schemaheroclientset/scheme/register.go b/pkg/client/schemaheroclientset/scheme/register.go
diff --git a/pkg/client/schemaheroclientset/typed/databases/v1alpha3/database.go b/pkg/client/schemaheroclientset/typed/databases/v1alpha3/database.go
diff --git a/pkg/client/schemaheroclientset/typed/databases/v1alpha3/databases_client.go b/pkg/client/schemaheroclientset/typed/databases/v1alpha3/databases_client.go
diff --git a/pkg/client/schemaheroclientset/typed/databases/v1alpha3/doc.go b/pkg/client/schemaheroclientset/typed/databases/v1alpha3/doc.go
diff --git a/pkg/client/schemaheroclientset/typed/databases/v1alpha3/fake/doc.go b/pkg/client/schemaheroclientset/typed/databases/v1alpha3/fake/doc.go
diff --git a/pkg/client/schemaheroclientset/typed/databases/v1alpha3/fake/fake_database.go b/pkg/client/schemaheroclientset/typed/databases/v1alpha3/fake/fake_database.go
diff --git a/pkg/client/schemaheroclientset/typed/databases/v1alpha3/fake/fake_databases_client.go b/pkg/client/schemaheroclientset/typed/databases/v1alpha3/fake/fake_databases_client.go
diff --git a/pkg/client/schemaheroclientset/typed/databases/v1alpha3/generated_expansion.go b/pkg/client/schemaheroclientset/typed/databases/v1alpha3/generated_expansion.go
diff --git a/pkg/client/schemaheroclientset/typed/schemas/v1alpha3/doc.go b/pkg/client/schemaheroclientset/typed/schemas/v1alpha3/doc.go
diff --git a/pkg/client/schemaheroclientset/typed/schemas/v1alpha3/fake/doc.go b/pkg/client/schemaheroclientset/typed/schemas/v1alpha3/fake/doc.go
diff --git a/pkg/client/schemaheroclientset/typed/schemas/v1alpha3/fake/fake_migration.go b/pkg/client/schemaheroclientset/typed/schemas/v1alpha3/fake/fake_migration.go
diff --git a/pkg/client/schemaheroclientset/typed/schemas/v1alpha3/fake/fake_schemas_client.go b/pkg/client/schemaheroclientset/typed/schemas/v1alpha3/fake/fake_schemas_client.go
diff --git a/pkg/client/schemaheroclientset/typed/schemas/v1alpha3/fake/fake_table.go b/pkg/client/schemaheroclientset/typed/schemas/v1alpha3/fake/fake_table.go
diff --git a/pkg/client/schemaheroclientset/typed/schemas/v1alpha3/generated_expansion.go b/pkg/client/schemaheroclientset/typed/schemas/v1alpha3/generated_expansion.go
diff --git a/pkg/client/schemaheroclientset/typed/schemas/v1alpha3/migration.go b/pkg/client/schemaheroclientset/typed/schemas/v1alpha3/migration.go
diff --git a/pkg/client/schemaheroclientset/typed/schemas/v1alpha3/schemas_client.go b/pkg/client/schemaheroclientset/typed/schemas/v1alpha3/schemas_client.go
diff --git a/pkg/client/schemaheroclientset/typed/schemas/v1alpha3/table.go b/pkg/client/schemaheroclientset/typed/schemas/v1alpha3/table.go
diff --git a/pkg/controller/table/objects.go b/pkg/controller/table/objects.go
@@ -137,11 +137,11 @@ func (r *ReconcileTable) planPod(database *databasesv1alpha3.Database, table *sc
 	return pod, nil
 }
 
-func (r *ReconcileTable) ensureTableConfigMap(desiredConfigMap *corev1.ConfigMap) error {
+func (r *ReconcileTable) ensureTableConfigMap(ctx context.Context, desiredConfigMap *corev1.ConfigMap) error {
 	existingConfigMap := corev1.ConfigMap{}
-	if err := r.Get(context.Background(), types.NamespacedName{Name: desiredConfigMap.Name, Namespace: desiredConfigMap.Namespace}, &existingConfigMap); err != nil {
+	if err := r.Get(ctx, types.NamespacedName{Name: desiredConfigMap.Name, Namespace: desiredConfigMap.Namespace}, &existingConfigMap); err != nil {
 		if kuberneteserrors.IsNotFound(err) {
-			err = r.Create(context.Background(), desiredConfigMap)
+			err = r.Create(ctx, desiredConfigMap)
 			if err != nil {
 				return errors.Wrap(err, "failed to create configmap")
 			}
@@ -153,11 +153,11 @@ func (r *ReconcileTable) ensureTableConfigMap(desiredConfigMap *corev1.ConfigMap
 	return nil
 }
 
-func (r *ReconcileTable) ensureTablePod(desiredPod *corev1.Pod) error {
+func (r *ReconcileTable) ensureTablePod(ctx context.Context, desiredPod *corev1.Pod) error {
 	existingPod := corev1.Pod{}
-	if err := r.Get(context.Background(), types.NamespacedName{Name: desiredPod.Name, Namespace: desiredPod.Namespace}, &existingPod); err != nil {
+	if err := r.Get(ctx, types.NamespacedName{Name: desiredPod.Name, Namespace: desiredPod.Namespace}, &existingPod); err != nil {
 		if kuberneteserrors.IsNotFound(err) {
-			err = r.Create(context.Background(), desiredPod)
+			err = r.Create(ctx, desiredPod)
 			if err != nil {
 				return errors.Wrap(err, "failed to create table migration pod")
 			}