Merge pull request #203 from AbsaOSS/168-depresolver-init

Change context initialisation, fix helm upgrade
k8gb-io · Nov 18, 2020 · 8ed4c72 · 8ed4c72
2 parents f5d6a09 + 7d226bc
commit 8ed4c72
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/config/crd/bases/k8gb.absa.oss_gslbs.yaml b/config/crd/bases/k8gb.absa.oss_gslbs.yaml
@@ -296,9 +296,9 @@ spec:
       type: object
   version: v1beta1
   versions:
-  - name: v1beta1
-    served: true
-    storage: true
+    - name: v1beta1
+      served: true
+      storage: true
 status:
   acceptedNames:
     kind: ""

diff --git a/main.go b/main.go
@@ -89,7 +89,7 @@ func main() {
 		Log:    ctrl.Log.WithName("controllers").WithName("Gslb"),
 		Scheme: mgr.GetScheme(),
 	}
-	reconciler.DepResolver = depresolver.NewDependencyResolver(context.TODO(), reconciler.Client)
+	reconciler.DepResolver = depresolver.NewDependencyResolver(context.Background(), reconciler.Client)
 	reconciler.Config, err = reconciler.DepResolver.ResolveOperatorConfig()
 	if err != nil {
 		setupLog.Error(err, "reading config env variables")