Merge branch 'main' into adopted-cluster-e2e

k0rdent · Jan 15, 2025 · f3ddbf1 · f3ddbf1
2 parents c9ed221 + 75122e9
commit f3ddbf1
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
-# Mirantis Hybrid Multi Cluster (KCM), Codename: Project 0x2A
+# k0rdent Cluster Manager (KCM)
 
 ## Overview
 
-Mirantis Hybrid Multi Cluster is part of Mirantis Project 0x2A which is focused
+k0rdent Cluster Manager is part of k0rdent which is focused
 on delivering a open source approach to providing an enterprise grade
 multi-cluster kubernetes management solution based entirely on standard open
 source tooling that works across private or public clouds.
@@ -20,13 +20,13 @@ Detailed documentation is available in [K0rdent Docs](https://k0rdent.github.io/
 ### TL;DR
 
 ```bash
-kubectl apply -f https://github.com/K0rdent/kcm/releases/download/v0.0.6/install.yaml
+kubectl apply -f https://github.com/K0rdent/kcm/releases/download/v0.0.7/install.yaml
 ```
 
 or install using `helm`
 
 ```bash
-helm install kcm oci://ghcr.io/k0rdent/kcm/charts/kcm --version 0.0.6 -n kcm-system --create-namespace
+helm install kcm oci://ghcr.io/k0rdent/kcm/charts/kcm --version 0.0.7 -n kcm-system --create-namespace
 ```
 
 Then follow the [Deploy a cluster deployment](#create-a-clusterdeployment) guide to
@@ -43,7 +43,7 @@ See [Install KCM for development purposes](docs/dev.md#kcm-installation-for-deve
 
 ### Software Prerequisites
 
-Mirantis Hybrid Container Cloud requires the following:
+Mirantis kcm requires the following:
 
 1. Existing management cluster (minimum required kubernetes version 1.28.0).
 2. `kubectl` CLI installed locally.
@@ -68,7 +68,7 @@ helm install kcm oci://ghcr.io/k0rdent/kcm/charts/kcm --version <kcm-version> -n
 
 #### Extended Management configuration
 
-By default, the Hybrid Container Cloud is being deployed with the following
+By default, kcm is being deployed with the following
 configuration:
 
 ```yaml
@@ -217,7 +217,7 @@ spec:
       iamInstanceProfile: nodes.cluster-api-provider-aws.sigs.k8s.io
       instanceType: ""
     workersNumber: 2
-  template: aws-standalone-cp-0-0-4
+  template: aws-standalone-cp-0-0-5
   credential: aws-credential
   dryRun: true
 ```
@@ -235,7 +235,7 @@ metadata:
   name: aws-standalone
   namespace: kcm-system
 spec:
-  template: aws-standalone-cp-0-0-4
+  template: aws-standalone-cp-0-0-5
   credential: aws-credential
   config:
     region: us-east-2

diff --git a/config/dev/adopted-clusterdeployment.yaml b/config/dev/adopted-clusterdeployment.yaml
@@ -4,7 +4,7 @@ metadata:
   name: adopted-dev
   namespace: ${NAMESPACE}
 spec:
-  template: adopted-cluster-0-0-1
+  template: adopted-cluster-0-0-2
   credential: adopted-cluster-cred
   config: {}
   serviceSpec:

diff --git a/config/dev/aks-clusterdeployment.yaml b/config/dev/aks-clusterdeployment.yaml
@@ -4,7 +4,7 @@ metadata:
   name: azure-aks-dev
   namespace: ${NAMESPACE}
 spec:
-  template: azure-aks-0-0-1
+  template: azure-aks-0-0-2
   credential: azure-aks-credential
   propagateCredentials: false
   config:

diff --git a/config/dev/aws-clusterdeployment.yaml b/config/dev/aws-clusterdeployment.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     k0rdent.mirantis.com/component: kcm
 spec:
-  template: aws-standalone-cp-0-0-4
+  template: aws-standalone-cp-0-0-5
   credential: aws-cluster-identity-cred
   config:
     controlPlane:

diff --git a/config/dev/azure-clusterdeployment.yaml b/config/dev/azure-clusterdeployment.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     k0rdent.mirantis.com/component: kcm
 spec:
-  template: azure-standalone-cp-0-0-4
+  template: azure-standalone-cp-0-0-5
   credential: azure-cluster-identity-cred
   config:
     controlPlaneNumber: 1

diff --git a/config/dev/eks-clusterdeployment.yaml b/config/dev/eks-clusterdeployment.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     k0rdent.mirantis.com/component: kcm
 spec:
-  template: aws-eks-0-0-2
+  template: aws-eks-0-0-3
   credential: "aws-cluster-identity-cred"
   config:
     region: ${AWS_REGION}

diff --git a/config/dev/openstack-clusterdeployment.yaml b/config/dev/openstack-clusterdeployment.yaml
@@ -4,12 +4,12 @@ metadata:
   name: openstack-dev
   namespace: ${NAMESPACE}
 spec:
-  template: openstack-standalone-cp-0-0-1
+  template: openstack-standalone-cp-0-0-2
   credential: openstack-cluster-identity-cred
   config:
     controlPlaneNumber: 1
     workersNumber: 1
-    controlPlane:
+    controlplane:
       flavor: ${OPENSTACK_CONTROL_PLANE_MACHINE_FLAVOR}
       image:
         filter:
@@ -19,4 +19,11 @@ spec:
       image:
         filter:
           name: ${OPENSTACK_IMAGE_NAME}
+    externalNetwork:
+      filter:
+        name: "public"
     authURL: ${OS_AUTH_URL}
+    identityRef:
+      name: "openstack-cloud-config"
+      cloudName: "openstack"
+      region: ${OS_REGION_NAME}
diff --git a/config/dev/vsphere-clusterdeployment.yaml b/config/dev/vsphere-clusterdeployment.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     k0rdent.mirantis.com/component: kcm
 spec:
-  template: vsphere-standalone-cp-0-0-3
+  template: vsphere-standalone-cp-0-0-5
   credential: vsphere-cluster-identity-cred
   config:
     controlPlaneNumber: 1

diff --git a/templates/provider/kcm-templates/Chart.yaml b/templates/provider/kcm-templates/Chart.yaml
@@ -13,4 +13,4 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.0.6
+version: 0.0.7
diff --git a/templates/provider/kcm-templates/files/release.yaml b/templates/provider/kcm-templates/files/release.yaml
@@ -1,15 +1,15 @@
 apiVersion: k0rdent.mirantis.com/v1alpha1
 kind: Release
 metadata:
-  name: kcm-0-0-6
+  name: kcm-0-0-7
   annotations:
     helm.sh/resource-policy: keep
   labels:
     k0rdent.mirantis.com/component: kcm
 spec:
-  version: 0.0.6
+  version: 0.0.7
   kcm:
-    template: kcm-0-0-6
+    template: kcm-0-0-7
   capi:
     template: cluster-api-0-0-6
   providers:

diff --git a/templates/provider/kcm-templates/files/templates/kcm.yaml b/templates/provider/kcm-templates/files/templates/kcm.yaml
@@ -1,7 +1,7 @@
 apiVersion: k0rdent.mirantis.com/v1alpha1
 kind: ProviderTemplate
 metadata:
-  name: kcm-0-0-6
+  name: kcm-0-0-7
   annotations:
     helm.sh/resource-policy: keep
   labels:
@@ -10,7 +10,7 @@ spec:
   helm:
     chartSpec:
       chart: kcm
-      version: 0.0.6
+      version: 0.0.7
       interval: 10m0s
       sourceRef:
         kind: HelmRepository

diff --git a/templates/provider/kcm/Chart.lock b/templates/provider/kcm/Chart.lock
@@ -4,9 +4,9 @@ dependencies:
   version: 2.14.0
 - name: cert-manager
   repository: https://charts.jetstack.io
-  version: v1.16.1
+  version: v1.16.2
 - name: cluster-api-operator
   repository: https://kubernetes-sigs.github.io/cluster-api-operator
   version: 0.15.1
-digest: sha256:ba894e71230268164bfcd65813ac700776cc7da1603fd68522cdedd543468d97
-generated: "2024-12-30T09:28:33.584882+07:00"
+digest: sha256:f068e94c55bea2f75210f42f5fd2b8641e6cf0c7dc611ca9ea779d05387a321d
+generated: "2025-01-14T17:01:06.682429+07:00"
diff --git a/templates/provider/kcm/Chart.yaml b/templates/provider/kcm/Chart.yaml
@@ -13,15 +13,15 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.0.6
+version: 0.0.7
 
 dependencies:
   - name: flux2
     version: 2.14.0
     repository: https://fluxcd-community.github.io/helm-charts
     condition: flux2.enabled
   - name: cert-manager
-    version: 1.16.1
+    version: 1.16.2
     repository: https://charts.jetstack.io
     condition: cert-manager.enabled
   - name: cluster-api-operator