feat: remote deployment (full) (#343)

---------

On-behalf-of: @SAP angel.kafazov@sap.com
Signed-off-by: Angel Kafazov <akafazov@cst-bg.net>

Author: akafazov

.gitignore

@@ -42,4 +42,7 @@ test/e2e/kind/certs/
 *.key
 **/__debug_bin*
 gha-logs.txt
+*.kubeconfig
+debug
+.cursor/*
 test/e2e/kind/kind-testcluster.kubeconfig

Dockerfile

@@ -23,6 +23,8 @@ COPY internal/ internal/
 COPY pkg/ pkg/
 COPY manifests/ manifests/
 
+COPY gotemplates/ gotemplates/
+
 # Build
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} go build -ldflags '-w -s' -o manager main.go
 
@@ -34,6 +36,6 @@ ENV USER_UID=1001
 ENV GROUP_UID=1001
 COPY --from=builder --chown=${USER_UID}:${GROUP_UID} /workspace/manager /operator/manager
 COPY --from=builder --chown=${USER_UID}:${GROUP_UID} /workspace/manifests /operator/manifests
-
+COPY --from=builder --chown=${USER_UID}:${GROUP_UID} /workspace/gotemplates /operator/gotemplates
 USER ${USER_UID}:${GROUP_UID}
 ENTRYPOINT ["/operator/manager"]

README.md

@@ -23,13 +23,21 @@ import (
 
 // PlatformMeshSpec defines the desired state of PlatformMesh
 type PlatformMeshSpec struct {
-	Exposure       *ExposureConfig      `json:"exposure,omitempty"`
-	Kcp            Kcp                  `json:"kcp,omitempty"`
-	Values         apiextensionsv1.JSON `json:"values,omitempty"`
-	OCM            *OCMConfig           `json:"ocm,omitempty"`
-	FeatureToggles []FeatureToggle      `json:"featureToggles,omitempty"`
-	InfraValues    apiextensionsv1.JSON `json:"infraValues,omitempty"`
-	Wait           *WaitConfig          `json:"wait,omitempty"`
+	Exposure         *ExposureConfig      `json:"exposure,omitempty"`
+	Kcp              Kcp                  `json:"kcp,omitempty"`
+	Values           apiextensionsv1.JSON `json:"values,omitempty"`
+	OCM              *OCMConfig           `json:"ocm,omitempty"`
+	FeatureToggles   []FeatureToggle      `json:"featureToggles,omitempty"`
+	InfraValues      apiextensionsv1.JSON `json:"infraValues,omitempty"`
+	Wait             *WaitConfig          `json:"wait,omitempty"`
+	ProfileConfigMap *ConfigMapReference  `json:"profileConfigMap,omitempty"`
+}
+
+type ConfigMapReference struct {
+	// +kubebuilder:validation:MinLength=1
+	Name string `json:"name"`
+	// +optional
+	Namespace string `json:"namespace,omitempty"`
 }
 
 type WaitConfig struct {
@@ -79,24 +87,17 @@ type Kcp struct {
 	ProviderConnections      []ProviderConnection             `json:"providerConnections,omitempty"`
 	ExtraProviderConnections []ProviderConnection             `json:"extraProviderConnections,omitempty"`
 	ExtraDefaultAPIBindings  []DefaultAPIBindingConfiguration `json:"extraDefaultAPIBindings,omitempty"`
-	// ExtraWorkspaces allows declaring additional workspaces that the operator will create.
 	// +optional
 	ExtraWorkspaces []WorkspaceDeclaration `json:"extraWorkspaces,omitempty"`
 }
 
-// WorkspaceDeclaration defines a workspace to be created by the operator.
 type WorkspaceDeclaration struct {
-	// Path is the full logical path of the workspace to be created (e.g., "root:orgs:my-workspace").
-	Path string `json:"path"`
-	// Type defines the WorkspaceType for the new workspace.
+	Path string                 `json:"path"`
 	Type WorkspaceTypeReference `json:"type"`
 }
 
-// WorkspaceTypeReference specifies the type of a workspace.
 type WorkspaceTypeReference struct {
-	// Name is the name of the WorkspaceType.
 	Name string `json:"name"`
-	// Path is the logical cluster path where the WorkspaceType is defined.
 	Path string `json:"path"`
 }
 
@@ -127,10 +128,8 @@ type KCPAPIVersionKindRef struct {
 }
 
 type SecretReference struct {
-	// name is unique within a namespace to reference a secret resource.
 	// +optional
 	Name string `json:"name,omitempty" protobuf:"bytes,1,opt,name=name"`
-	// namespace defines the space within which the secret name must be unique.
 	// +optional
 	Namespace string `json:"namespace,omitempty" protobuf:"bytes,2,opt,name=namespace"`
 }

api/v1alpha1/platformmesh_types.go

@@ -19,22 +19,25 @@ package cmd
 import (
 	"context"
 	"crypto/tls"
+	"fmt"
 	"net/http"
 	"os"
 
 	pmcontext "github.com/platform-mesh/golang-commons/context"
 	"github.com/spf13/cobra"
+	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
 	_ "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/client"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 	mcmanager "sigs.k8s.io/multicluster-runtime/pkg/manager"
 
 	"github.com/platform-mesh/golang-commons/traces"
-	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
 
 	"github.com/platform-mesh/platform-mesh-operator/internal/controller"
+	"github.com/platform-mesh/platform-mesh-operator/pkg/subroutines"
 )
 
 var operatorCmd = &cobra.Command{
@@ -86,6 +89,16 @@ func RunController(_ *cobra.Command, _ []string) { // coverage-ignore
 	log.Info().Msg("Starting manager")
 
 	restCfg := ctrl.GetConfigOrDie()
+	if operatorCfg.RemoteRuntime.IsEnabled() {
+		setupLog.Info("Remote PlatformMesh reconciliation enabled, kubeconfig: " + operatorCfg.RemoteRuntime.Kubeconfig)
+		var err error
+		_, restCfg, err = subroutines.GetClientAndRestConfig(operatorCfg.RemoteRuntime.Kubeconfig)
+		if err != nil {
+			setupLog.Error(err, "unable to create PlatformMesh client")
+			os.Exit(1)
+		}
+	}
+	setupLog.Info(fmt.Sprintf("PlatformMesh Host: %s", restCfg.Host))
 	restCfg.Wrap(func(rt http.RoundTripper) http.RoundTripper {
 		return otelhttp.NewTransport(rt)
 	})
@@ -117,9 +130,28 @@ func RunController(_ *cobra.Command, _ []string) { // coverage-ignore
 		os.Exit(1)
 	}
 
-	log.Info().Msg("Manager successfully started")
+	log.Info().Msg("Manager successfully created")
+
+	restCfgInfra := ctrl.GetConfigOrDie()
+	restCfgInfra.Wrap(func(rt http.RoundTripper) http.RoundTripper {
+		return otelhttp.NewTransport(rt)
+	})
+	clientInfra, err := client.New(restCfgInfra, client.Options{Scheme: subroutines.GetClientScheme()})
+	if err != nil {
+		setupLog.Error(err, "unable to create Infra client")
+		os.Exit(1)
+	}
+	if operatorCfg.RemoteInfra.IsEnabled() {
+		var infraErr error
+		clientInfra, _, infraErr = subroutines.GetClientAndRestConfig(operatorCfg.RemoteInfra.Kubeconfig)
+		if infraErr != nil {
+			setupLog.Error(infraErr, "unable to create Infra client")
+			os.Exit(1)
+		}
+	}
+	imageVersionStore := subroutines.NewImageVersionStore()
 
-	pmReconciler, err := controller.NewPlatformMeshReconciler(mgr, &operatorCfg, defaultCfg, operatorCfg.WorkspaceDir)
+	pmReconciler, err := controller.NewPlatformMeshReconciler(mgr, &operatorCfg, defaultCfg, operatorCfg.WorkspaceDir, clientInfra, imageVersionStore)
 	if err != nil {
 		setupLog.Error(err, "unable to create PlatformMesh reconciler")
 		os.Exit(1)
@@ -129,16 +161,15 @@ func RunController(_ *cobra.Command, _ []string) { // coverage-ignore
 		os.Exit(1)
 	}
 
-	resourceReconciler, err := controller.NewResourceReconciler(mgr, &operatorCfg)
+	resourceReconciler, err := controller.NewResourceReconciler(mgr, &operatorCfg, clientInfra, imageVersionStore)
 	if err != nil {
 		setupLog.Error(err, "unable to create Resource reconciler")
 		os.Exit(1)
 	}
 	if err := resourceReconciler.SetupWithManager(mgr, defaultCfg); err != nil {
-		setupLog.Error(err, "unable to create controller", "controller", "PlatformMesh")
+		setupLog.Error(err, "unable to create controller", "controller", "Resource")
 		os.Exit(1)
 	}
-
 	if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {
 		setupLog.Error(err, "unable to set up health check")
 		os.Exit(1)
@@ -152,4 +183,5 @@ func RunController(_ *cobra.Command, _ []string) { // coverage-ignore
 	if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {
 		log.Fatal().Err(err).Msg("problem running manager")
 	}
+
 }

api/v1alpha1/zz_generated.deepcopy.go

@@ -235,6 +235,21 @@ spec:
                         type: string
                     type: object
                 type: object
+              profileConfigMap:
+                description: ProfileConfigMap references a ConfigMap containing profile
+                  configuration for this PlatformMesh instance.
+                properties:
+                  name:
+                    description: Name is the name of the ConfigMap.
+                    minLength: 1
+                    type: string
+                  namespace:
+                    description: Namespace is the namespace of the ConfigMap. If not
+                      specified, defaults to the PlatformMesh resource's namespace.
+                    type: string
+                required:
+                - name
+                type: object
               values:
                 x-kubernetes-preserve-unknown-fields: true
               wait:

cmd/operator.go

@@ -0,0 +1,32 @@
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: platform-mesh-operator-argocd-role
+  namespace: argocd
+rules:
+- apiGroups:
+  - argoproj.io
+  resources:
+  - appprojects
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - argoproj.io
+  resources:
+  - applications
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+

config/crd/core.platform-mesh.io_platformmeshes.yaml

@@ -0,0 +1,18 @@
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  labels:
+    app.kubernetes.io/name: platform-mesh-operator
+    app.kubernetes.io/managed-by: kustomize
+  name: platform-mesh-operator-argocd-rolebinding
+  namespace: argocd
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: platform-mesh-operator-argocd-role
+subjects:
+- kind: ServiceAccount
+  name: platform-mesh-operator
+  namespace: platform-mesh-system
+

config/rbac/argocd_role.yaml

@@ -24,4 +24,7 @@ resources:
 # if you do not want those helpers be installed with your Project.
 - platform-mesh_editor_role.yaml
 - platform-mesh_viewer_role.yaml
+# RBAC for ArgoCD namespace (required for AppProject resources)
+- argocd_role.yaml
+- argocd_role_binding.yaml