[Carvel] Introduce support to kapp controller

This commit introduces support for creating App CR
in extension controller.

Signed-off-by: Varsha Prasad Narsing <[email protected]>

Author: varshaprasad96

cmd/manager/main.go

@@ -18,6 +18,7 @@ package main
 
 import (
 	"flag"
+	"fmt"
 	"net/http"
 	"os"
 	"time"
@@ -29,13 +30,17 @@ import (
 	"go.uber.org/zap/zapcore"
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+	"k8s.io/client-go/discovery"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
+	"k8s.io/client-go/rest"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 	"sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
+	carvelv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1"
+
 	ocv1alpha1 "github.com/operator-framework/operator-controller/api/v1alpha1"
 	"github.com/operator-framework/operator-controller/internal/catalogmetadata/cache"
 	catalogclient "github.com/operator-framework/operator-controller/internal/catalogmetadata/client"
@@ -54,6 +59,7 @@ func init() {
 	utilruntime.Must(ocv1alpha1.AddToScheme(scheme))
 	utilruntime.Must(rukpakv1alpha2.AddToScheme(scheme))
 	utilruntime.Must(catalogd.AddToScheme(scheme))
+	utilruntime.Must(carvelv1alpha1.AddToScheme(scheme))
 
 	//+kubebuilder:scaffold:scheme
 }
@@ -124,8 +130,18 @@ func main() {
 		os.Exit(1)
 	}
 
+	hasKappApis, err := HasKappApis(mgr.GetConfig())
+	// We should probably prefer to proceed with creating BD instead of exiting?
+	if err != nil {
+		setupLog.Error(err, "unable to evaluate if App needs to be created")
+		os.Exit(1)
+	}
+
 	if err = (&controllers.ExtensionReconciler{
-		Client: cl,
+		Client:         cl,
+		BundleProvider: catalogClient,
+		Resolver:       resolver,
+		HasKappApis:    hasKappApis,
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "Extension")
 		os.Exit(1)
@@ -147,3 +163,23 @@ func main() {
 		os.Exit(1)
 	}
 }
+
+// HasKappApis checks whether the cluster has Kapp APIs installed in the cluster.
+// This does not guarantee that the controller is present to reconcile the App CRs.
+func HasKappApis(config *rest.Config) (bool, error) {
+	discoveryClient, err := discovery.NewDiscoveryClientForConfig(config)
+	if err != nil {
+		return false, fmt.Errorf("creating discovery client: %v", err)
+	}
+	apiResourceList, err := discoveryClient.ServerResourcesForGroupVersion(carvelv1alpha1.SchemeGroupVersion.String())
+	if err != nil {
+		return false, fmt.Errorf("listing resource APIs: %v", err)
+	}
+
+	for _, resource := range apiResourceList.APIResources {
+		if resource.Kind == "App" {
+			return true, nil
+		}
+	}
+	return false, nil
+}

config/rbac/role.yaml

@@ -29,6 +29,17 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - kappctrl.k14s.io
+  resources:
+  - apps
+  verbs:
+  - create
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - olm.operatorframework.io
   resources:
@@ -73,5 +84,6 @@ rules:
   resources:
   - extensions/status
   verbs:
+  - get
   - patch
   - update

go.mod

@@ -1,6 +1,8 @@
 module github.com/operator-framework/operator-controller
 
-go 1.20
+go 1.21
+
+toolchain go1.21.0
 
 require (
 	github.com/Masterminds/semver/v3 v3.2.1
@@ -13,6 +15,7 @@ require (
 	github.com/operator-framework/rukpak v0.18.0
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.8.4
+	github.com/vmware-tanzu/carvel-kapp-controller v0.50.0
 	go.uber.org/zap v1.27.0
 	golang.org/x/exp v0.0.0-20231006140011-7918f672742d
 	gopkg.in/yaml.v2 v2.4.0
@@ -117,6 +120,7 @@ require (
 	github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
 	github.com/ulikunitz/xz v0.5.11 // indirect
 	github.com/vbatts/tar-split v0.11.5 // indirect
+	github.com/vmware-tanzu/carvel-vendir v0.36.0 // indirect
 	go.etcd.io/bbolt v1.3.8 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
@@ -128,15 +132,15 @@ require (
 	go.opentelemetry.io/otel/trace v1.21.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/mod v0.14.0 // indirect
-	golang.org/x/net v0.20.0 // indirect
+	golang.org/x/mod v0.15.0 // indirect
+	golang.org/x/net v0.21.0 // indirect
 	golang.org/x/oauth2 v0.15.0 // indirect
 	golang.org/x/sync v0.6.0 // indirect
 	golang.org/x/sys v0.17.0 // indirect
 	golang.org/x/term v0.17.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.16.1 // indirect
+	golang.org/x/tools v0.18.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 // indirect