continue sketch

Signed-off-by: Matthias Büchse <[email protected]>

Author: mbuechse

Tests/kaas/plugin/plugin_kind.py

@@ -14,40 +14,20 @@ class PluginKind(KubernetesClusterPlugin):
     Plugin to handle the provisioning of kubernetes cluster for
     conformance testing purpose with the use of Kind
     """
-    def __init__(self, config_path):
-        logger.info("Init PluginKind")
-        self.config = config_path
+    def __init__(self, config, basepath='.'):
+        self.basepath = basepath
+        self.config = config
         logger.debug(self.config)
-        self.working_directory = os.getcwd()
-        logger.debug(f"Working from {self.working_directory}")
 
-    def create_cluster(self, cluster_name, version, kubeconfig):
-        """
-        This method is to be called to create a k8s cluster
-        :param: kubernetes_version:
-        :return: kubeconfig_filepath
-        """
-        cluster_version = version
-        # latest versions to be found under https://hub.docker.com/r/kindest/node/tags
-        if cluster_version == '1.29':
-            cluster_version = 'v1.29.14'
-        elif cluster_version == '1.30':
-            cluster_version = 'v1.30.10'
-        elif cluster_version == '1.31' or cluster_version == 'default':
-            cluster_version = 'v1.31.6'
-        elif cluster_version == '1.32':
-            cluster_version = 'v1.32.3'
-        cluster_image = f"kindest/node:{cluster_version}"
-        kubeconfig_filepath = Path(kubeconfig)
-        if kubeconfig_filepath is None:
-            raise ValueError("kubeconfig_filepath is missing")
-        else:
-            self.cluster = KindCluster(name=cluster_name, image=cluster_image, kubeconfig=kubeconfig_filepath)
-        if self.config is None:
-            self.cluster.create()
-        else:
-            self.cluster.create(self.config)
+    def create_cluster(self, kubeconfig_path):
+        cluster_name = self.config['name']
+        cluster_image = self.config['image']
+        cluster_yaml = self.config.get('cluster')
+        if cluster_yaml and not os.path.isabs(cluster_yaml):
+            cluster_yaml = os.path.normpath(os.path.join(self.basepath, cluster_yaml))
+        cluster = KindCluster(name=cluster_name, image=cluster_image, kubeconfig=Path(kubeconfig_path))        
+        cluster.create(cluster_yaml)
 
-    def delete_cluster(self, cluster_name):
-        self.cluster = KindCluster(cluster_name)
-        self.cluster.delete()
+    def delete_cluster(self):
+        cluster_name = self.config['name']
+        KindCluster(cluster_name).delete()

Tests/kaas/plugin/run_plugin.py

@@ -13,28 +13,28 @@
     "kind": PluginKind,
     "static": PluginStatic,
 }
+BASEPATH = os.path.join(os.path.expanduser('~'), '.config', 'scs')
 
 
-def load_config(path=None):
-    if path:
-        with open(path, "rb") as fileobj:
-            cfg = yaml.load(fileobj, Loader=yaml.SafeLoader)
-        if not isinstance(cfg, dict):
-            raise RuntimeError('clusters.yaml must be a YAML dict')
-        if 'clusters' not in cfg or not isinstance(cfg['clusters'], dict):
-            raise RuntimeError('clusters.yaml must be a YAML dict, and so must be .clusters')
-        return cfg
-    path = os.path.join(os.path.expanduser('~'), '.config', 'scs', 'clusters.yaml')
-    if os.path.exists(path):
-        return load_config(path)
-    raise FileNotFoundError('config')
+def load_config(path='clusters.yaml'):
+    if not os.path.isabs(path):
+        return load_config(os.path.normpath(os.path.join(BASEPATH, path)))
+    if not os.path.exists(path):
+        raise FileNotFoundError()
+    with open(path, "rb") as fileobj:
+        cfg = yaml.load(fileobj, Loader=yaml.SafeLoader)
+    if not isinstance(cfg, dict):
+        raise RuntimeError('clusters.yaml must be a YAML dict')
+    if 'clusters' not in cfg or not isinstance(cfg['clusters'], dict):
+        raise RuntimeError('clusters.yaml must be a YAML dict, and so must be .clusters')
+    return cfg
 
 
 def init_plugin(plugin_kind, config):
     plugin_maker = PLUGIN_LOOKUP.get(plugin_kind)
     if plugin_maker is None:
         raise ValueError(f"unknown plugin '{plugin_kind}'")
-    return plugin_maker(config)
+    return plugin_maker(config, basepath=BASEPATH)
 
 
 @click.group()
@@ -44,19 +44,20 @@ def cli():
 
 @cli.command()
 @click.argument('cluster_id', type=str, default="default")
-@cli.pass_obj
+@click.pass_obj
 def create(cfg, cluster_id):
-    spec = cfg[cluster_id]
+    spec = cfg['clusters'][cluster_id]
     config = spec['config']
     config['name'] = cluster_id
-    init_plugin(spec['kind'], config).create_cluster()
+    kubeconfig_path = os.path.abspath(os.path.join(cluster_id, 'kubeconfig.yaml'))
+    init_plugin(spec['kind'], config).create_cluster(kubeconfig_path)
 
 
 @cli.command()
 @click.argument('cluster_id', type=str, default="default")
-@cli.pass_obj
+@click.pass_obj
 def delete(cfg, cluster_id):
-    spec = cfg[cluster_id]
+    spec = cfg['clusters'][cluster_id]
     config = spec['config']
     config['name'] = cluster_id
     init_plugin(spec['kind'], config).delete_cluster()

Tests/kaas/kind_config.yaml playbooks/.config/scs/kind-cluster.yamlTests/kaas/kind_config.yaml renamed to playbooks/.config/scs/kind-cluster.yaml

@@ -0,0 +1,34 @@
+apiVersion: cluster.x-k8s.io/v1beta1
+kind: Cluster
+metadata:
+  name: '{{ name }}'
+spec:
+  clusterNetwork:
+    services:
+      cidrBlocks: ['10.128.0.0/12']
+    pods:
+      cidrBlocks: ['192.168.0.0/16']
+    serviceDomain: 'cluster.local'
+  topology:
+    # the following variables can be determined automatically using autoVars: syself
+    # for this detection, we list all clusterstackrelease objects and select the latest one that fits the
+    # requested kubernetesVersion
+    class: '{{ cs_class_name }}'
+    version: '{{ cs_version }}'
+    controlPlane:
+      replicas: 3
+    workers:
+      machineDeployments:
+        - class: workeramd64hcloud
+          name: md-0
+          replicas: 1
+          failureDomain: nbg1
+          variables:
+            overrides:
+              - name: workerMachineTypeHcloud
+                value: cpx31
+    variables:
+      - name: region
+        value: nbg1
+      - name: controlPlaneMachineTypeHcloud
+        value: cpx31

playbooks/.config/scs/syself-cluster.yaml

@@ -0,0 +1,25 @@
+apiVersion: clusterstack.x-k8s.io/v1alpha1
+kind: ClusterStack
+metadata:
+  name: '{{ cs_name }}'
+spec:
+  provider: hetzner
+  name: apalla
+  kubernetesVersion: '{{ kubernetesVersion }}'
+  channel: stable
+  autoSubscribe: true
+  providerRef:
+    name: '{{ cs_name }}'
+    kind: HetznerClusterStackReleaseTemplate
+    apiVersion: infrastructure.clusterstack.x-k8s.io/v1alpha1
+---
+apiVersion: infrastructure.clusterstack.x-k8s.io/v1alpha1
+kind: HetznerClusterStackReleaseTemplate
+metadata:
+  name: '{{ cs_name }}'
+spec:
+  template:
+    spec:
+      nodeImages:
+        - controlplaneamd64hcloud
+        - workeramd64hcloud

playbooks/.config/scs/syself-clusterstack.yaml

@@ -0,0 +1,19 @@
+apiVersion: v1
+clusters:
+- cluster:
+    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM2akNDQWRLZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRJek1Ea3hNREEyTXpnek1sb1hEVE16TURrd056QTJORE16TWxvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTWE3CjJYYWRieFVKSHdQSGQxMTNHNHdnSGZmL0RTMEhYVitaQjRyRDEvVllDSnFEemRTN2NkeC8yY245a3Z0VHA3UjgKakFVWUdkbndaTkdiWlZSY2xVZEMraWhTTFlMdU1kallWcWFyU3VmbVZlQ3lHcTFLQnNkTFpOcmpMU2RTL2o3awo1ZEZBL0Y2WmYzSzBlV3RZeDhJWTliQjQ0ZXgyY29ZOU1HTjV6WEUyZCs3Wm8wSVVCWXcxWHB1ODdYZFdlSzJJCjhpR0xxdVZFcGRac0lvZEJNZk4yWTVLK3JXVmJyQUhpWXB5U0llNkVyLzlpYU5nS2hndjlQanlBRFBHNEtFc2YKTjg3UDNWK2d4eG1VNzVVRUQwTjFXdXB3YkRLekVYY0JwajJ1QXF2MzA4SVM5ZzNwRE1oUVFKUDc5NjBFMUpqVwpOKzJWQzREZkY4K2FsUEF1S1VNQ0F3RUFBYU5GTUVNd0RnWURWUjBQQVFIL0JBUURBZ0trTUJJR0ExVWRFd0VCCi93UUlNQVlCQWY4Q0FRQXdIUVlEVlIwT0JCWUVGTVdxem03TjNxUDhIL2JsMHJvaUlkK1hVdkRSTUEwR0NTcUcKU0liM0RRRUJDd1VBQTRJQkFRQi9CSlNtVnB3aGhFTCtCNExicDBDVFdwYmFhL0xlTDVkdEZZL01wMnVpbXdPMQpKeWVuV0U5QWpJaTRMU1puV00yYzh2QTRkbmlMdXcwdjZrUGFjeHlIQVQ0Zk5WcFRpcURPNyt1L1hXaTZmYUMxCkNYanJjNjJxbXBWd0MwckhsU1U4eHpQckk3MHltNmVSZUJNUE5VV1k4OTc2K2pTQ1o0ZEdxc0g4aU1SMzNpT2UKd1BNQWltUTFabktXL0RpRkZoYXc3MHUrdEFOcGw4VXFuSjR4SGJIY2hpMkJ4b0M1Mzk4ZS82QVNsOVlKbG5MRwpCRFZCeFZISnpmTTZoM0lBQS9hVEtPM3JZSFlrWURVWFlkNXh0RTkvNForaXJKV1BBNzA5aFRXbHF3VWk5U25iCnhQMHppMFZteDRONjUvN1IxS3Z3UTJlS3N1d3ZqQ3ZMdnZ5Y3RUNTgKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+    server: https://autopilot-1.autopilot-prod.k8s.syself.net:443
+  name: autopilot-1
+contexts:
+- context:
+    cluster: autopilot-1
+    namespace: org-scs
+    user: gitops
+  name: default
+current-context: default
+kind: Config
+preferences: {}
+users:
+- name: gitops
+  user:
+    token: '{{ token }}'

playbooks/.config/scs/syself-kubeconfig.yaml

@@ -3,30 +3,61 @@ clusters:
   syself-1.32:
     kind: clusterstacks
     config:
-      token: "{{ clouds_conf.syself_token }}"
       kubernetesVersion: '1.32'
-      autoVars: syself  # will determine class and version automatically using kubernetesVersion
-      cluster: syself-cluster.yaml
-      clusterstack: syself-clusterstack.yaml
+      autoVars: syself  # determine cs_class_name and cs_version automatically using kubernetesVersion
+      templates:
+        cluster: syself-cluster.yaml
+        clusterstack: syself-clusterstack.yaml
+        kubeconfig: syself-kubeconfig.yaml
       vars:
-        cs-name: hetzner-apalla-1-32
+        cs_name: hetzner-apalla-1-32
+      secrets:
+        token: "{{ clouds_conf.syself_token }}"
   syself-1.31:
     kind: clusterstacks
     config:
-      token: "{{ clouds_conf.syself_token }}"
       kubernetesVersion: '1.31'
-      autoVars: syself  # will determine class and version automatically using kubernetesVersion
-      cluster: syself-cluster.yaml
-      clusterstack: syself-clusterstack.yaml
+      autoVars: syself  # determine cs_class_name and cs_version automatically using kubernetesVersion
+      templates:
+        cluster: syself-cluster.yaml
+        clusterstack: syself-clusterstack.yaml
+        kubeconfig: syself-kubeconfig.yaml
       vars:
-        cs-name: hetzner-apalla-1-31
+        cs_name: hetzner-apalla-1-31
+      secrets:
+        token: "{{ clouds_conf.syself_token }}"
   syself-1.30:
     kind: clusterstacks
     config:
-      token: "{{ clouds_conf.syself_token }}"
       kubernetesVersion: '1.30'
-      autoVars: syself  # will determine class and version automatically using kubernetesVersion
-      cluster: syself-cluster.yaml
-      clusterstack: syself-clusterstack.yaml
+      autoVars: syself  # determine cs_class_name and cs_version automatically using kubernetesVersion
+      templates:
+        cluster: syself-cluster.yaml
+        clusterstack: syself-clusterstack.yaml
+        kubeconfig: syself-kubeconfig.yaml
       vars:
-        cs-name: hetzner-apalla-1-30
+        cs_name: hetzner-apalla-1-30
+      secrets:
+        token: "{{ clouds_conf.syself_token }}"
+  # dev clusters using kind
+  # latest versions to be found under https://hub.docker.com/r/kindest/node/tags
+  kind-1.32:
+    kind: kind
+    config:
+      cluster: kind-cluster.yaml
+      image: 'kindest/node:v1.32.3'
+  kind-1.31:
+    kind: kind
+    config:
+      cluster: kind-cluster.yaml
+      image: 'kindest/node:v1.31.6'
+  kind-1.30:
+    kind: kind
+    config:
+      cluster: kind-cluster.yaml
+      image: 'kindest/node:v1.30.10'
+  kind-1.29:
+    kind: kind
+    config:
+      cluster: kind-cluster.yaml
+      image: 'kindest/node:v1.29.14'