Fix/multiple providers (#1348)

* update typo * update tf templates * update templates & docs * update docs * fix typo * Auto commit - update kustomization.yaml * update docs * Auto commit - update kustomization.yaml --------- Co-authored-by: CI/CD pipeline <CI/CD-pipeline@users.noreply.github.com>
berops · May 3, 2024 · 6cf315a · 6cf315a
1 parent 9ae30c0
commit 6cf315a
Show file tree

Hide file tree

Showing 44 changed files with 724 additions and 606 deletions.
diff --git a/docs/contributing/local-testing.md b/docs/contributing/local-testing.md
@@ -105,16 +105,7 @@ providers:
 
 nodePools:
   dynamic:
-    - name: hetzner-control
-      providerSpec:
-        name: hetzner-1
-        region: nbg1
-        zone: nbg1-dc3
-      count: 1
-      serverType: cpx11
-      image: ubuntu-22.04
-
-    - name: hetzner-compute
+    - name: htz-compute
       providerSpec:
         name: hetzner-1
         region: nbg1
@@ -137,11 +128,13 @@ nodePools:
     - name: static-pool
       nodes:
         - endpoint: "192.168.52.1"
+          username: root
           privateKey: |
             -----BEGIN RSA PRIVATE KEY-----
             ...... put the private key here .....
             -----END RSA PRIVATE KEY-----
         - endpoint: "192.168.52.2"
+          username: root
           privateKey: |
             -----BEGIN RSA PRIVATE KEY-----
             ...... put the private key here .....
@@ -156,7 +149,7 @@ kubernetes:
         control:
           - static-pool
         compute:
-          - hetzner-compute
+          - htz-compute
 
 loadBalancers:
   roles:

diff --git a/docs/getting-started/detailed-guide.md b/docs/getting-started/detailed-guide.md
@@ -139,7 +139,7 @@ This detailed guide for Claudie serves as a resource for providing an overview o
             namespace: mynamespace    
       nodePools:
         dynamic:
-          - name: aws-controlplane
+          - name: aws-control
             providerSpec:
                 name: aws-1
                 region: eu-central-1
@@ -156,7 +156,7 @@ This detailed guide for Claudie serves as a resource for providing an overview o
             serverType: t3.medium
             image: ami-03df6dea56f8aa618
             storageDiskSize: 200
-          - name: aws-loadbalancer
+          - name: aws-lb
             providerSpec:
                 name: aws-1
                 region: eu-central-2
@@ -167,11 +167,11 @@ This detailed guide for Claudie serves as a resource for providing an overview o
       kubernetes:
         clusters:
           - name: my-super-cluster
-            version: v1.24.0
+            version: v1.27.0
             network: 192.168.2.0/24
             pools:
                 control:
-                - aws-controlplane
+                - aws-control
                 compute:
                 - aws-worker
       loadBalancers:
@@ -181,7 +181,7 @@ This detailed guide for Claudie serves as a resource for providing an overview o
             port: 6443
             targetPort: 6443
             targetPools:
-                - aws-controlplane
+                - aws-control
         clusters:
           - name: loadbalance-me
             roles:
@@ -192,7 +192,7 @@ This detailed guide for Claudie serves as a resource for providing an overview o
                 hostname: supercluster # the sub domain of the new cluster
             targetedK8s: my-super-cluster
             pools:
-                - aws-loadbalancer
+                - aws-lb
     ```
 
     !!! note "Tip!"
@@ -354,7 +354,7 @@ This detailed guide for Claudie serves as a resource for providing an overview o
             network: 192.168.2.0/24
             pools:
                 control:
-                - aws-controlplane
+                - aws-control
                 compute:
                 - aws-worker
                 - hetzner-worker  # add it to the compute list here
@@ -388,8 +388,8 @@ This detailed guide for Claudie serves as a resource for providing an overview o
             protocol: tcp
             port: 6443
             targetPort: 6443
-            targetPools: # only loadbalances for port 6443 for the aws-controlplane nodepool
-                - aws-controlplane
+            targetPools: # only loadbalances for port 6443 for the aws-control nodepool
+                - aws-control
           - name: https
             protocol: tcp
             port: 443
@@ -408,7 +408,7 @@ This detailed guide for Claudie serves as a resource for providing an overview o
                 hostname: supercluster
             targetedK8s: my-super-cluster
             pools:
-                - aws-loadbalancer
+                - aws-lb
     ```
     !!! note Load balancing
         Please refer how our load balancing works by reading our [documentation](https://docs.claudie.io/latest/loadbalancing/loadbalancing-solution/).

diff --git a/docs/input-manifest/api-reference.md b/docs/input-manifest/api-reference.md
@@ -33,7 +33,7 @@ needs to be defined.
 
 - `name`
 
-  The name of the provider specification. It has to be unique across all providers.
+  The name of the provider specification. The name is limited to 15 characters. It has to be unique across all providers.
 
 - `providerType`
 
@@ -199,15 +199,15 @@ Dynamic nodepools are defined for cloud provider machines that Claudie is expect
 
 - `name`
 
-  Name of the nodepool. Each nodepool will have a random hash appended to the name, so the whole name will be of format `<name>-<hash>`.
+  Name of the nodepool. The name is limited by 14 characters. Each nodepool will have a random hash appended to the name, so the whole name will be of format `<name>-<hash>`.
 
 - `provideSpec` [Provider spec](#provider-spec)
 
   Collection of provider data to be used while creating the nodepool.  
 
 - `count`
 
-  Number of the nodes in the nodepool. Mutually exclusive with `autoscaler`.
+  Number of the nodes in the nodepool. Maximum value of 255.  Mutually exclusive with `autoscaler`.
 
 - `serverType`
 
@@ -294,7 +294,7 @@ Static nodepools are defined for static machines which Claudie will not manage.
 
 - `name`
 
-  Name of the static nodepool.
+  Name of the static nodepool. The name is limited  by 14 characters.
 
 - `nodes` [Static Node](#static-node)
 
@@ -361,7 +361,7 @@ Collection of data used to define a Kubernetes cluster.
 
 - `name`
 
-  Name of the Kubernetes cluster. Each cluster will have a random hash appended to the name, so the whole name will be of format `<name>-<hash>`.
+  Name of the Kubernetes cluster. The name is limited by 28 characters. Each cluster will have a random hash appended to the name, so the whole name will be of format `<name>-<hash>`.
 
 - `version`
 
@@ -435,7 +435,7 @@ Collection of data used to define a loadbalancer cluster.
 
 - `name`
 
-  Name of the loadbalancer.
+  Name of the loadbalancer. The name is limited by 28 characters.
 
 - `roles`
 

diff --git a/docs/input-manifest/example.md b/docs/input-manifest/example.md
@@ -94,7 +94,7 @@ spec:
     #
     # Example definitions for each provider
     dynamic:
-      - name: control-hetzner
+      - name: control-htz
         providerSpec:
           name: hetzner-1
           region: hel1
@@ -112,7 +112,7 @@ spec:
             value: finland
             effect: NoSchedule
 
-      - name: compute-hetzner
+      - name: compute-htz
         providerSpec:
           name: hetzner-1
           region: hel1
@@ -127,7 +127,7 @@ spec:
         annotations:
           node.longhorn.io/default-node-tags: '["finland"]'
 
-      - name: compute-hetzner-autoscaled
+      - name: htz-autoscaled
         providerSpec:
           name: hetzner-1
           region: hel1
@@ -295,8 +295,8 @@ spec:
         annotations:
           node.longhorn.io/default-node-tags: '["datacenter-1"]'   
         taints:
-          key: datacenter
-          effect: NoExecute
+          - key: datacenter
+            effect: NoExecute
 
 
   # Kubernetes field is used to define the kubernetes clusters.
@@ -318,25 +318,26 @@ spec:
         network: 192.168.2.0/24
         pools:
           control:
-            - control-hetzner
+            - control-htz
             - control-gcp
           compute:
-            - compute-hetzner
+            - compute-htz
             - compute-gcp
             - compute-azure
+            - htz-autoscaled
 
       - name: prod-cluster
         version: v1.26.13
         network: 192.168.2.0/24
         pools:
           control:
-            - control-hetzner
+            - control-htz
             - control-gcp
             - control-oci
             - control-aws
             - control-azure
           compute:
-            - compute-hetzner
+            - compute-htz
             - compute-gcp
             - compute-oci
             - compute-aws
@@ -349,7 +350,7 @@ spec:
           control:
             - datacenter-1
           compute:
-            - compute-hetzner
+            - compute-htz
             - compute-gcp
             - compute-azure
 
@@ -383,7 +384,7 @@ spec:
         port: 6443
         targetPort: 6443
         targetPools:
-            - k8s-control-gcp # make sure that this nodepools is acutally used by the targeted `dev-cluster` cluster.
+            - control-htz # make sure that this nodepools is acutally used by the targeted `dev-cluster` cluster.
     clusters:
       - name: apiserver-lb-dev
         roles:

diff --git a/docs/input-manifest/gpu-example.md b/docs/input-manifest/gpu-example.md
@@ -22,7 +22,7 @@ spec:
 
   nodePools:
     dynamic:
-    - name: genesiscloud-cpu
+    - name: gencloud-cpu
       providerSpec:
         name: genesiscloud
         region: ARC-IS-HAF-1
@@ -31,7 +31,7 @@ spec:
       image: "Ubuntu 22.04"
       storageDiskSize: 50
 
-    - name: genesiscloud-gpu
+    - name: gencloud-gpu
       providerSpec:
         name: genesiscloud
         region: ARC-IS-HAF-1
@@ -47,9 +47,9 @@ spec:
         network: 172.16.2.0/24
         pools:
           control:
-            - genesiscloud-cpu
+            - gencloud-cpu
           compute:
-            - genesiscloud-gpu
+            - gencloud-gpu
 ```
 
 After the `InputManifest` was successfully build by claudie, we deploy the `gpu-operator` to the `gpu-examepl`kubernetes cluster.

diff --git a/docs/input-manifest/providers/aws.md b/docs/input-manifest/providers/aws.md
@@ -161,7 +161,7 @@ spec:
   kubernetes:
     clusters:
       - name: aws-cluster
-        version: v1.24.0
+        version: v1.27.0
         network: 192.168.2.0/24
         pools:
           control:
@@ -266,7 +266,7 @@ spec:
   kubernetes:
     clusters:
       - name: aws-cluster
-        version: v1.24.0
+        version: v1.27.0
         network: 192.168.2.0/24
         pools:
           control: