feat: account info and larger refactoring for cluster level CRDs and KCP

.gitignore

@@ -10,6 +10,7 @@ Dockerfile.cross
 .secret
 .env
 .taskenv
+.kcp/*
 
 # Test binary, built with `go test -c`
 *.test
@@ -29,4 +30,5 @@ go.work
 *.swp
 *.swo
 *~
-.DS_Store
+.DS_Store
+kcp.log

Taskfile.yml

@@ -6,14 +6,24 @@ vars:
   CONTROLLER_TOOLS_VERSION: v0.14.0
   ENVTEST_K8S_VERSION: "1.29.0"
   ENVTEST_VERSION: release-0.17
-  CRD_DIRECTORY: config/crd/bases
+  CRD_DIRECTORY: config/crd
+  TEST_SETUP_DIRECTORY: test/setup/openmfp-system
   KCP_APIGEN_VERSION: v0.21.0
+  KCP_VERSION: 0.26.1
+  GOARCH:
+    sh: go env GOARCH
+  GOOS:
+    sh: go env GOOS
 tasks:
   ## Setup
   setup:controller-gen:
     internal: true
     cmds:
       - test -s {{.LOCAL_BIN}}/controller-gen || GOBIN=$(pwd)/{{.LOCAL_BIN}} go install sigs.k8s.io/controller-tools/cmd/controller-gen@{{.CONTROLLER_TOOLS_VERSION}}
+  setup:kcp:
+    internal: true
+    cmds:
+      - test -s {{.LOCAL_BIN}}/kcp || GOBIN=$(pwd)/{{.LOCAL_BIN}} ./hack/download-tool.sh https://github.com/kcp-dev/kcp/releases/download/v{{ .KCP_VERSION }}/kcp_{{ .KCP_VERSION }}_{{ .GOOS }}_{{ .GOARCH }}.tar.gz kcp {{.KCP_VERSION}}
   setup:envtest:
     internal: true
     cmds:
@@ -36,7 +46,8 @@ tasks:
     cmds:
       - task: manifests
       - "{{.LOCAL_BIN}}/controller-gen object:headerFile=hack/boilerplate.go.txt paths=./..."
-      - "{{.LOCAL_BIN}}/apigen --input-dir ./config/crd/bases --output-dir ./config/resources"
+      - "{{.LOCAL_BIN}}/apigen --input-dir {{.CRD_DIRECTORY}} --output-dir ./config/resources"
+      - "{{.LOCAL_BIN}}/apigen --input-dir {{.CRD_DIRECTORY}} --output-dir {{ .TEST_SETUP_DIRECTORY }}"
   build:
     cmds:
       - go build ./...
@@ -76,4 +87,8 @@ tasks:
     cmds:
       - task: lint
       - task: test
+  start-kcp:
+    deps: [setup:kcp]
+    cmds:
+      - "{{ .LOCAL_BIN}}/kcp start"
 

api/v1alpha1/account_info_types.go

@@ -0,0 +1,54 @@
+/*
+Copyright 2024.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// AccountLocationSpec defines the desired state of Account
+type AccountLocationSpec struct {
+}
+
+// AccountLocationStatus defines the observed state of Account
+type AccountLocationStatus struct {
+}
+
+// +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
+// +kubebuilder:resource:scope=Cluster
+// Account is the Schema for the accounts API
+type AccountLocation struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   AccountLocationSpec   `json:"spec,omitempty"`
+	Status AccountLocationStatus `json:"status,omitempty"`
+}
+
+//+kubebuilder:object:root=true
+
+// AccountLocationList contains a list of Account
+type AccountLocationList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []Account `json:"items"`
+}
+
+func init() {
+	SchemeBuilder.Register(&AccountLocation{}, &AccountLocationList{})
+}

api/v1alpha1/account_types.go

@@ -26,8 +26,8 @@ type AccountType string
 const (
 	AccountTypeFolder                   AccountType = "folder"
 	AccountTypeAccount                  AccountType = "account"
-	NamespaceAccountOwnerLabel                      = "account.core.openmfp.io/owner"
-	NamespaceAccountOwnerNamespaceLabel             = "account.core.openmfp.io/owner-namespace"
+	NamespaceAccountOwnerLabel                      = "account.core.openmfp.org/owner"
+	NamespaceAccountOwnerNamespaceLabel             = "account.core.openmfp.org/owner-namespace"
 )
 
 // AccountSpec defines the desired state of Account
@@ -76,6 +76,7 @@ type AccountStatus struct {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
+// +kubebuilder:resource:scope=Cluster
 // +kubebuilder:printcolumn:JSONPath=".spec.displayName",name="Display Name",type=string
 // +kubebuilder:printcolumn:JSONPath=".status.namespace",name="Account Namespace",type=string
 // +kubebuilder:printcolumn:JSONPath=".spec.type",name="Type",type=string

api/v1alpha1/groupversion_info.go

@@ -16,7 +16,7 @@ limitations under the License.
 
 // Package v1alpha1 contains API Schema definitions for the core v1alpha1 API group
 // +kubebuilder:object:generate=true
-// +groupName=core.openmfp.io
+// +groupName=core.openmfp.org
 package v1alpha1
 
 import (
@@ -26,7 +26,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "core.openmfp.io", Version: "v1alpha1"}
+	GroupVersion = schema.GroupVersion{Group: "core.openmfp.org", Version: "v1alpha1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

cmd/operator.go

@@ -34,6 +34,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 
 	tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1"
+
 	"github.com/openmfp/account-operator/api/v1alpha1"
 	"github.com/openmfp/account-operator/internal/config"
 	"github.com/openmfp/account-operator/internal/controller"
@@ -97,10 +98,7 @@ func RunController(_ *cobra.Command, _ []string) { // coverage-ignore
 		tlsOpts = append(tlsOpts, disableHTTP2)
 	}
 
-	if cfg.Kcp.Enabled {
-		utilruntime.Must(tenancyv1alpha1.AddToScheme(scheme))
-	}
-
+	utilruntime.Must(tenancyv1alpha1.AddToScheme(scheme))
 	webhookServer := webhook.NewServer(webhook.Options{
 		TLSOpts: tlsOpts,
 		CertDir: cfg.Webhooks.CertDir,
@@ -117,21 +115,17 @@ func RunController(_ *cobra.Command, _ []string) { // coverage-ignore
 		WebhookServer:                 webhookServer,
 		HealthProbeBindAddress:        probeAddr,
 		LeaderElection:                enableLeaderElection,
-		LeaderElectionID:              "8c290d9a.openmfp.io",
+		LeaderElectionID:              "8c290d9a.openmfp.org",
 		LeaderElectionConfig:          restCfg,
 		LeaderElectionReleaseOnCancel: true,
 	}
 	var mgr ctrl.Manager
 	var err error
-	if cfg.Kcp.Enabled {
-		mgrConfig := rest.CopyConfig(restCfg)
-		if len(cfg.Kcp.VirtualWorkspaceUrl) > 0 {
-			mgrConfig.Host = cfg.Kcp.VirtualWorkspaceUrl
-		}
-		mgr, err = kcp.NewClusterAwareManager(mgrConfig, opts)
-	} else {
-		mgr, err = ctrl.NewManager(restCfg, opts)
+	mgrConfig := rest.CopyConfig(restCfg)
+	if len(cfg.Kcp.VirtualWorkspaceUrl) > 0 {
+		mgrConfig.Host = cfg.Kcp.VirtualWorkspaceUrl
 	}
+	mgr, err = kcp.NewClusterAwareManager(mgrConfig, opts)
 	if err != nil {
 		log.Fatal().Err(err).Msg("unable to start manager")
 	}
@@ -161,10 +155,10 @@ func RunController(_ *cobra.Command, _ []string) { // coverage-ignore
 }
 
 func initLog() *logger.Logger { // coverage-ignore
-	logcfg := logger.DefaultConfig()
-	logcfg.Level = loglevel
-	logcfg.NoJSON = logNoJson
-	log, err := logger.New(logcfg)
+	cfg := logger.DefaultConfig()
+	cfg.Level = loglevel
+	cfg.NoJSON = logNoJson
+	log, err := logger.New(cfg)
 	if err != nil {
 		setupLog.Error(err, "unable to create logger")
 		os.Exit(1)