Merge pull request #193 from fi-ts/remove-crd-installer

Remove crd installer

Author: LimKianAn

Dockerfile

@@ -24,7 +24,6 @@ FROM gcr.io/distroless/static:nonroot
 WORKDIR /
 COPY --from=builder /workspace/manager .
 COPY external/svc-postgres-operator.yaml external/svc-postgres-operator.yaml
-COPY external/crd-postgresql.yaml external/crd-postgresql.yaml
 USER nonroot:nonroot
 
 ENTRYPOINT ["/manager"]

external/crd-postgresql.yaml renamed to charts/postgreslet/crds/postgresql.yaml

@@ -50,6 +50,8 @@ var (
 	externalYAMLDir     = filepath.Join("..", "external")
 	externalYAMLDirTest = filepath.Join(externalYAMLDir, "test")
 
+	HelmCRDDir = filepath.Join("..", "charts", "postgreslet", "crds")
+
 	instance = &pg.Postgres{}
 )
 
@@ -77,7 +79,7 @@ var _ = BeforeSuite(func(done Done) {
 	svcClusterTestEnv = &envtest.Environment{
 		CRDInstallOptions: envtest.CRDInstallOptions{
 			Paths: []string{
-				filepath.Join(externalYAMLDir, "crd-postgresql.yaml"),
+				filepath.Join(HelmCRDDir, "postgresql.yaml"),
 				filepath.Join(externalYAMLDirTest, "crd-clusterwidenetworkpolicy.yaml"),
 			},
 		},

controllers/suite_test.go

@@ -24,7 +24,6 @@ import (
 
 	databasev1 "github.com/fi-ts/postgreslet/api/v1"
 	"github.com/fi-ts/postgreslet/controllers"
-	"github.com/fi-ts/postgreslet/pkg/crdinstaller"
 	"github.com/fi-ts/postgreslet/pkg/lbmanager"
 	"github.com/fi-ts/postgreslet/pkg/operatormanager"
 	firewall "github.com/metal-stack/firewall-controller/api/v1"
@@ -91,16 +90,6 @@ func main() {
 	)
 
 	svcClusterConf := ctrl.GetConfigOrDie()
-	i, err := crdinstaller.New(svcClusterConf, scheme, ctrl.Log.WithName("CRDInstaller"))
-	if err != nil {
-		setupLog.Error(err, "unable to create `CRDInstaller`")
-		os.Exit(1)
-	}
-	if err := i.Install("external/crd-postgresql.yaml"); err != nil {
-		setupLog.Error(err, "unable to install CRD Postgresql")
-		os.Exit(1)
-	}
-
 	svcClusterMgr, err := ctrl.NewManager(svcClusterConf, ctrl.Options{
 		Scheme:             scheme,
 		MetricsBindAddress: metricsAddrSvcMgr,