switch to 2.28 in saas and introduce legacy keyword for older versions

karmab · Jan 19, 2024 · d217d2c · d217d2c
1 parent b01f1ab
commit d217d2c
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 31 deletions.
diff --git a/.github/workflows/deploy_cluster.yml b/.github/workflows/deploy_cluster.yml
@@ -53,7 +53,7 @@ jobs:
            kcli create sushy-service
        - name: Install aicli
          run: |
-           pip3 install -U 'assisted-service-client<2.28.0.post1'
+           pip3 install -U assisted-service-client
            python3 setup.py install
        - name: Clean up
          continue-on-error: true

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -26,7 +26,7 @@ jobs:
            kcli create sushy-service
        - name: Install aicli
          run: |
-           pip3 install -U 'assisted-service-client<2.28.0.post1'
+           pip3 install -U assisted-service-client
            python3 setup.py install
        - name: Clean up
          continue-on-error: true

diff --git a/ailib/__init__.py b/ailib/__init__.py
@@ -150,8 +150,8 @@ def __init__(self, url='https://api.openshift.com', token=None, offlinetoken=Non
             except Exception as e:
                 error(f"Hit issue when trying to set token. Got {e}")
                 if os.path.exists(offlinetokenpath):
-                    error("Removing offlinetoken file")
-                    os.remove(offlinetokenpath)
+                    error(f"Moving wrong offlinetoken file to {offlinetokenpath}.old")
+                    move(offlinetokenpath, "{offlinetokenpath}.old")
                 sys.exit(1)
             self.config.api_key['Authorization'] = self.token
             self.config.api_key_prefix['Authorization'] = 'Bearer'
@@ -201,34 +201,22 @@ def set_default_values(self, overrides, existing=False, quiet=False):
                 overrides['openshift_version'] = str(overrides['openshift_version'])
             if overrides['openshift_version'] == 4.1:
                 overrides['openshift_version'] = '4.10'
-        # service_networks = overrides.get('service_networks', [])
-        # dual = len(service_networks) > 1 and ':' in service_networks[1]
+        api_vips = overrides.get('api_vips', [])
         api_vip = overrides.get('api_vip') or overrides.get('api_ip')
         if api_vip is not None:
-            overrides['api_vip'] = api_vip
-            # if not dual:
-            #     if 'api_ip' in overrides:
-            #         del overrides['api_ip']
-            #     if 'api_vip' in overrides:
-            #         del overrides['api_vip']
-            #     warning("Ignoring api_ip at creation time", quiet=quiet or existing)
+            if 'api_vip' in overrides:
+                del overrides['api_vip']
+            if api_vip not in api_vips:
+                api_vips.append({'ip': api_vip})
+                overrides['api_vips'] = api_vips
+        ingress_vips = overrides.get('ingress_vips', [])
         ingress_vip = overrides.get('ingress_vip') or overrides.get('ingress_ip')
         if ingress_vip is not None:
-            overrides['ingress_vip'] = ingress_vip
-            # if not dual:
-            #     if 'ingress_ip' in overrides:
-            #         del overrides['ingress_ip']
-            #     if 'ingress_vip' in overrides:
-            #         del overrides['ingress_vip']
-            #     warning("Ignoring ingress_ip at creation time", quiet=quiet or existing)
-        # api_vips = overrides.get('api_vips', [])
-        # if not dual and api_vips:
-        #     warning("Ignoring api_vips at creation time", quiet=quiet or existing)
-        #     del overrides['api_vips']
-        # ingress_vips = overrides.get('ingress_vips', [])
-        # if not dual and ingress_vips:
-        #     warning("Ignoring ingress_vips at creation time", quiet=quiet or existing)
-        #     del overrides['ingress_vips']
+            if 'ingress_vip' in overrides:
+                del overrides['ingress_vip']
+            if ingress_vip not in ingress_vips:
+                ingress_vips.append({'ip': ingress_vip})
+                overrides['ingress_vips'] = ingress_vips
         if not existing:
             if 'pull_secret' not in overrides:
                 warning("Using openshift_pull.json as pull_secret file", quiet=quiet)

diff --git a/assisted-service-client.spec b/assisted-service-client.spec
@@ -15,7 +15,7 @@ VCS:            {{{ git_dir_vcs }}}
 Source:         {{{ git_dir_pack }}}
 AutoReq:        no
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  java python3 python3-setuptools
+BuildRequires:  java python3 python3-setuptools git
 Requires:       python3 python3-certifi
 
 %description
@@ -29,7 +29,7 @@ assisted-installer python library
 {{{ git_dir_setup_macro }}}
 
 %build
-git checkout v2.27.0
+# git checkout v2.27.0
 curl https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.4.8/swagger-codegen-cli-2.4.8.jar > swagger-codegen-cli.jar
 curl https://raw.githubusercontent.com/openshift/assisted-service/master/swagger.yaml > swagger.yaml
 sed -i '/pattern:/d' swagger.yaml

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 from setuptools import setup, find_packages
 
 import os
-INSTALL = ['assisted-service-client<2.28.0.post1', 'prettytable', 'PyYAML']
+INSTALL = ['assisted-service-client', 'prettytable', 'PyYAML']
 description = 'Assisted installer assistant'
 long_description = description
 if os.path.exists('README.rst'):