Merge branch 'stable' into monthlyupdate

Author: prveenkumr

.github/workflows/python-release.yml

@@ -45,7 +45,7 @@ jobs:
           cat ${GITHUB_WORKSPACE}/src/mas/devops/__init__.py
           python -m pip install --upgrade pip
           pip install .[dev]
-          python -m pytest -m "not openshift"
+          python -m pytest
 
       # 3. Flake8 Linting
       # -------------------------------------------------------------------------------------------

setup.py

@@ -53,7 +53,7 @@ def get_version(rel_path):
     install_requires=[
         'pyyaml',                  # MIT License
         'openshift',               # Apache Software License
-        'kubernetes',              # Apache Software License
+        'kubernetes<36',           # Apache Software License
         'kubeconfig',              # BSD License
         'setuptools',              # MIT License (required to install kubeconfig)
         'jinja2',                  # BSD License