RKE2 cluster via terraform

apiclient/rancher_api/api.py

@@ -86,8 +86,8 @@ def authenticate(self, user, passwd, **kwargs):
         except AssertionError:
             pass  # TODO: Log authenticate error
         else:
-            token = "Bearer %s" % r.json()['token']
-            self.session.headers.update(Authorization=token)
+            self.token = r.json()['token']
+            self.session.headers.update(Authorization=f"Bearer {self.token}")
             self._version = None
         return r.json()
 

apiclient/rancher_api/managers.py

@@ -325,7 +325,12 @@ def create(self, name, kubeconfig, cluster_id="", *, raw=False):
     def get(self, name="", *, raw=False):
         if name == "":
             return self._get(self.PATH_fmt.format(uid=""), raw=raw)
-        return self._get(self.PATH_fmt.format(uid=f"/{name}"), raw=raw)
+
+        code, data = self._get(self.PATH_fmt.format(uid=f"/{name}"), raw=raw)
+        if 404 == code:
+            code, data = self._get(self.PATH_fmt.format(uid=f"?name={name}"), raw=raw)
+
+        return code, data
 
     def delete(self, name, *, raw=False):
         return self._delete(self.PATH_fmt.format(uid=f"/{name}"), raw=raw)

config.yml

@@ -25,6 +25,7 @@ image-cache-url: ''
 
 # script location for terraform related test cases
 terraform-scripts-location: 'terraform_test_artifacts'
+terraform-provider-rancher: '3.1.1'
 
 # Backup Target S3
 s3-endpoint: ''
@@ -38,12 +39,11 @@ nfs-endpoint: ''
 nfs-mount-dir: 'nfsshare'
 
 # Rancher Cluster
-# rancher-endpoint: 'https://127.0.0.1'
-# External Rancher admin user password
-# rancher-admin-password: 'rancher_password'
+rancher-endpoint: 'https://127.0.0.1'
+rancher-admin-password: 'rancher_password'
 # Kubernetes version for RKE
-RKE1-version: 'v1.24.11-rancher2-1'
-RKE2-version: 'v1.24.11+rke2r1'
+RKE1-version: 'v1.26.11-rancher2-1'
+RKE2-version: 'v1.26.11+rke2r1'
 # Wait time for polling Rancher cluster status.
 rancher-cluster-wait-timeout: 7200
 

harvester_e2e_tests/conftest.py

@@ -249,6 +249,12 @@ def pytest_addoption(parser):
         default=config_data.get('terraform-provider-harvester'),
         help=('Version of Terraform Harvester Provider')
     )
+    parser.addoption(
+        '--terraform-provider-rancher',
+        action='store',
+        default=config_data.get('terraform-provider-rancher'),
+        help=('Version of Terraform Rancher Provider')
+    )
 
 
 def pytest_configure(config):