WIP Adding sevriceTemplates to ManagedCluster

.github/workflows/test.yml

@@ -18,6 +18,11 @@ env:
   AWS_REGION: us-west-2
   AWS_ACCESS_KEY_ID: ${{ secrets.CI_AWS_ACCESS_KEY_ID }}
   AWS_SECRET_ACCESS_KEY: ${{ secrets.CI_AWS_SECRET_ACCESS_KEY }}
+  AZURE_SUBSCRIPTION_ID: ${{ secrets.CI_AZURE_SUBSCRIPTION_ID }}
+  AZURE_TENANT_ID: ${{ secrets.CI_AZURE_TENANT_ID }}
+  AZURE_CLIENT_ID: ${{ secrets.CI_AZURE_CLIENT_ID }}
+  AZURE_CLIENT_SECRET: ${{ secrets.CI_AZURE_CLIENT_SECRET }}
+  NAMESPACE: hmc-system
 
 jobs:
   e2etest:

CODEOWNERS

@@ -0,0 +1,3 @@
+* @Kshatrix @eromanova @a13x5
+/.github/ @Kshatrix @squizzi @eromanova @a13x5
+/test/ @Kshatrix @squizzi @eromanova @a13x5

Makefile

@@ -111,7 +111,7 @@ test: generate-all fmt vet envtest tidy external-crd ## Run tests.
 # compatibility with other vendors.
 .PHONY: test-e2e # Run the e2e tests using a Kind k8s instance as the management cluster.
 test-e2e: cli-install
-	 KIND_CLUSTER_NAME="hmc-test" KIND_VERSION=$(KIND_VERSION) go test ./test/e2e/ -v -ginkgo.v -timeout=2h
+	KIND_CLUSTER_NAME="hmc-test" KIND_VERSION=$(KIND_VERSION) go test ./test/e2e/ -v -ginkgo.v -timeout=3h
 
 .PHONY: lint
 lint: golangci-lint ## Run golangci-lint linter & yamllint
@@ -269,7 +269,11 @@ helm-push: helm-package
 		chart_version=$$(echo $$base | grep -o "v\{0,1\}[0-9]\+\.[0-9]\+\.[0-9].*"); \
 		chart_name="$${base%-"$$chart_version"}"; \
 		echo "Verifying if chart $$chart_name, version $$chart_version already exists in $(REGISTRY_REPO)"; \
-		chart_exists=$$($(HELM) pull $$repo_flag $(REGISTRY_REPO) $$chart_name --version $$chart_version --destination /tmp 2>&1 | grep "not found" || true); \
+		if $(REGISTRY_IS_OCI); then \
+			chart_exists=$$($(HELM) pull $$repo_flag $(REGISTRY_REPO)/$$chart_name --version $$chart_version --destination /tmp 2>&1 | grep "not found" || true); \
+		else \
+			chart_exists=$$($(HELM) pull $$repo_flag $(REGISTRY_REPO) $$chart_name --version $$chart_version --destination /tmp 2>&1 | grep "not found" || true); \
+		fi; \
 		if [ -z "$$chart_exists" ]; then \
 			echo "Chart $$chart_name version $$chart_version already exists in the repository."; \
 		else \
@@ -303,7 +307,7 @@ dev-release:
 
 .PHONY: dev-aws-creds
 dev-aws-creds: envsubst
-	@NAMESPACE=$(NAMESPACE) $(ENVSUBST) -no-unset -i config/dev/aws-credentials.yaml | $(KUBECTL) apply -f -
+	@NAMESPACE=$(NAMESPACE) $(ENVSUBST) -i config/dev/aws-credentials.yaml | $(KUBECTL) apply -f -
 
 .PHONY: dev-azure-creds
 dev-azure-creds: envsubst
@@ -374,7 +378,7 @@ ENVSUBST ?= $(LOCALBIN)/envsubst-$(ENVSUBST_VERSION)
 AWSCLI ?= $(LOCALBIN)/aws
 
 ## Tool Versions
-CONTROLLER_TOOLS_VERSION ?= v0.14.0
+CONTROLLER_TOOLS_VERSION ?= v0.16.3
 ENVTEST_VERSION ?= release-0.17
 GOLANGCI_LINT_VERSION ?= v1.61.0
 HELM_VERSION ?= v3.15.1

PROJECT

@@ -84,4 +84,13 @@ resources:
   kind: ServiceTemplateChain
   path: github.com/Mirantis/hmc/api/v1alpha1
   version: v1alpha1
+- api:
+    crdVersion: v1
+    namespaced: true
+  controller: true
+  domain: hmc.mirantis.com
+  group: hmc.mirantis.com
+  kind: Credential
+  path: github.com/Mirantis/hmc/api/v1alpha1
+  version: v1alpha1
 version: "3"

README.md

@@ -1,4 +1,14 @@
-# Mirantis Hybrid Cloud Platform
+# Mirantis Hybrid Multi Cluster
+
+## Overview
+
+Mirantis Hybrid Multi Cluster is part of Mirantis Project 2A which is focused on delivering a 
+open source approach to providing an enterprise grade multi-cluster kubernetes managment solution
+based entirely on standard open source tooling.
+
+## Documentation
+
+Detailed documentation is available in [Project 2A Docs](https://mirantis.github.io/project-2a-docs/)
 
 ## Installation
 
@@ -34,10 +44,7 @@ Optionally, the following CLIs may be helpful:
 
 ### Providers configuration
 
-Follow the instruction to configure providers. Currently supported providers:
-* [AWS](docs/aws/main.md#prepare-the-aws-infra-provider)
-* [Azure](docs/azure/main.md)
-* [vSphere](docs/vsphere/main.md)
+Full details on the provider configuration can be found in the Project 2A Docs, see [Documentation](#documentation)
 
 ### Installation
 
@@ -47,8 +54,6 @@ export KUBECONFIG=<path-to-management-kubeconfig>
 helm install hmc oci://ghcr.io/mirantis/hmc/charts/hmc --version <hmc-version> -n hmc-system --create-namespace
 ```
 
-See [HMC configuration options](templates/hmc/values.yaml).
-
 #### Extended Management configuration
 
 By default, the Hybrid Container Cloud is being deployed with the following configuration:
@@ -106,9 +111,7 @@ export KUBECONFIG=<path-to-management-kubeconfig>
 kubectl get template -n hmc-system -o go-template='{{ range .items }}{{ if eq .status.type "deployment" }}{{ .metadata.name }}{{ printf "\n" }}{{ end }}{{ end }}'
 ```
 
-For details about the `Template system` in HMC, see [Templates system](docs/templates/main.md#templates-system).
-
-If you want to deploy hostded control plate template, make sure to check additional notes on [Hosted control plane](docs/aws/hosted-control-plane.md).
+If you want to deploy hostded control plate template, make sure to check additional notes on Hosted control plane in 2A Docs, see [Documentation](#documentation).
 
 2. Create the file with the `ManagedCluster` configuration:
 

api/v1alpha1/credential_types.go

@@ -0,0 +1,69 @@
+// 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 (
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+type CredentialState string
+
+const (
+	CredentialReady     CredentialState = "Ready"
+	CredentialNotFound  CredentialState = "Cluster Identity not found"
+	CredentialWrongType CredentialState = "Mismatched type"
+)
+
+// CredentialSpec defines the desired state of Credential
+type CredentialSpec struct {
+	// Reference to the Credential Identity
+	IdentityRef *corev1.ObjectReference `json:"identityRef"`
+	// Description of the Credential object
+	Description string `json:"description,omitempty"` // WARN: noop
+}
+
+// CredentialStatus defines the observed state of Credential
+type CredentialStatus struct {
+	State CredentialState `json:"state,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
+// +kubebuilder:resource:shortName=cred
+// +kubebuilder:printcolumn:name="State",type=string,JSONPath=`.status.state`
+// +kubebuilder:printcolumn:name="Description",type=string,JSONPath=`.spec.description`
+
+// Credential is the Schema for the credentials API
+type Credential struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   CredentialSpec   `json:"spec,omitempty"`
+	Status CredentialStatus `json:"status,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+
+// CredentialList contains a list of Credential
+type CredentialList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []Credential `json:"items"`
+}
+
+func init() {
+	SchemeBuilder.Register(&Credential{}, &CredentialList{})
+}

api/v1alpha1/managedcluster_types.go

@@ -25,7 +25,9 @@ const (
 	BlockingFinalizer       = "hmc.mirantis.com/cleanup"
 	ManagedClusterFinalizer = "hmc.mirantis.com/managed-cluster"
 
-	FluxHelmChartNameKey = "helm.toolkit.fluxcd.io/name"
+	FluxHelmChartNameKey      = "helm.toolkit.fluxcd.io/name"
+	FluxHelmChartNamespaceKey = "helm.toolkit.fluxcd.io/namespace"
+
 	HMCManagedLabelKey   = "hmc.mirantis.com/managed"
 	HMCManagedLabelValue = "true"
 
@@ -36,6 +38,8 @@ const (
 	// ManagedClusterKind is the string representation of a ManagedCluster.
 	ManagedClusterKind = "ManagedCluster"
 
+	// CredentialReadyCondition indicates if referenced Credential exists and has Ready state
+	CredentialReadyCondition = "CredentialReady"
 	// TemplateReadyCondition indicates the referenced Template exists and valid.
 	TemplateReadyCondition = "TemplateReady"
 	// HelmChartReadyCondition indicates the corresponding HelmChart is valid and ready.
@@ -60,6 +64,26 @@ const (
 	ProgressingReason string = "Progressing"
 )
 
+// ManagedClusterServiceSpec represents a Service within ManagedCluster
+type ManagedClusterServiceSpec struct {
+	// Template is a reference to a Template object located in the same namespace.
+	// +kubebuilder:validation:MinLength=1
+	Template string `json:"template"`
+	// Disable can be set to disable handling of this service.
+	// +optional
+	Disable bool `json:"disable"`
+	// Name is the chart release.
+	// +kubebuilder:validation:MinLength=1
+	Name string `json:"name"`
+	// Namespace is the namespace the release will be installed in.
+	// It will default to Name if not provided.
+	// +optional
+	Namespace string `json:"namespace"`
+	// Values is the helm values to be passed to the template.
+	// +optional
+	Values *apiextensionsv1.JSON `json:"values,omitempty"`
+}
+
 // ManagedClusterSpec defines the desired state of ManagedCluster
 type ManagedClusterSpec struct {
 	// Config allows to provide parameters for template customization.
@@ -72,7 +96,12 @@ type ManagedClusterSpec struct {
 	// Template is a reference to a Template object located in the same namespace.
 	Template string `json:"template"`
 	// DryRun specifies whether the template should be applied after validation or only validated.
-	DryRun bool `json:"dryRun,omitempty"`
+	DryRun     bool   `json:"dryRun,omitempty"`
+	Credential string `json:"credential,omitempty"`
+	// Services is a list of services created via ServiceTemplates
+	// that could be installed on the target cluster.
+	// +optional
+	Services []ManagedClusterServiceSpec `json:"services,omitempty"`
 }
 
 // ManagedClusterStatus defines the observed state of ManagedCluster

api/v1alpha1/management_types.go

@@ -25,8 +25,10 @@ const (
 
 	CoreCAPIName = "capi"
 
-	ManagementName      = "hmc"
-	ManagementFinalizer = "hmc.mirantis.com/management"
+	ManagementKind         = "Management"
+	ManagementName         = "hmc"
+	ManagementFinalizer    = "hmc.mirantis.com/management"
+	TemplateManagementName = "hmc"
 )
 
 // ManagementSpec defines the desired state of Management

api/v1alpha1/templatemanagement_types.go

@@ -18,6 +18,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
+const TemplateManagementKind = "TemplateManagement"
+
 // TemplateManagementSpec defines the desired state of TemplateManagement
 type TemplateManagementSpec struct {
 	// AccessRules is the list of access rules. Each AccessRule enforces