Merge pull request #176 from rundeck-plugins/RUN-2676

RUN-2676 : Overhaul

Author: ahormazabal

.github/workflows/tests.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ '2.x', '3.x' ]
+        python-version: [ '3.x' ]
 
     steps:
     - uses: actions/checkout@v3

.gitignore

@@ -24,4 +24,11 @@ gradle-app.setting
 # End of https://www.gitignore.io/api/java,gradle
 
 
-.DS_Store
+.DS_Store
+
+# Testing content
+.tox
+
+**/__pycache__
+
+/kubernetes_rundeck_plugin.egg-info/*

README.md

@@ -33,6 +33,22 @@ python setup.py install
 
 Run `gradle build` to build the zip file. Then, copy the zip file to the `$RDECK_BASE\libext` folder.
 
+## Testing
+
+To run the tests specified in the `tox.ini` file, follow these steps:
+
+- Install Tox: Ensure you have Tox installed. You can install it using pip:
+   ```sh
+   pip install tox
+   ```
+- Run Tox: Execute Tox in the directory containing the `tox.ini` file. This will run the tests in all specified environments:
+   ```sh
+   tox
+   ```
+- Run Specific Environment: If you want to run tests for a specific environment (e.g., Python 3.8), you can specify the environment:
+   ```sh
+   tox -e py38
+   ```
 
 ## Authentication
 

contents/common.py

@@ -323,11 +323,12 @@ def parseJson(obj):
 
 
 def create_pod_template_spec(data):
-    ports = []
 
-    for port in data["ports"].split(','):
-        portDefinition = client.V1ContainerPort(container_port=int(port))
-        ports.append(portDefinition)
+    ports = []
+    if data["ports"]:
+        for port in data["ports"].split(','):
+            portDefinition = client.V1ContainerPort(container_port=int(port))
+            ports.append(portDefinition)
 
     envs = []
     if "environments" in data:

contents/deployment-update.py

@@ -106,11 +106,15 @@ def create_deployment_object(data):
         template.metadata = client.V1ObjectMeta(labels=labels)
 
     # Create the specification of deployment
-    spec = client.ExtensionsV1beta1DeploymentSpec(
+    spec = client.V1DeploymentSpec(
         replicas=int(data["replicas"]),
-        template=template)
+        template=template,
+        selector=client.V1LabelSelector(
+            match_labels={}  # This will match all pods
+        )
+    )
     # Instantiate the deployment object
-    deployment = client.ExtensionsV1beta1Deployment(
+    deployment = client.V1Deployment(
         api_version=data["api_version"],
         kind="Deployment",
         metadata=client.V1ObjectMeta(labels=labels,

contents/pods-resource-model.py

@@ -137,8 +137,9 @@ def nodeCollectData(pod, container, defaults, taglist, mappingList, boEmoticon):
     data['terminated'] = terminated
 
     # Add labels as its own map of node attributes.
-    for key, value in pod.metadata.labels.items():
-        data['labels:' + key] = value
+    if pod.metadata.labels is not None:
+        for key, value in pod.metadata.labels.items():
+            data['labels:' + key] = value
 
     emoticon = ""
     if default_settings['default:status'] == "running":

plugin.yaml

@@ -195,7 +195,7 @@ providers:
           groupName: Advanced
         description: "This plugin is written in python. Use this to define the python interpreter that is used to execute this plugin."
         type: Select
-        values: "python,python2,python3"
+        values: "python,python3"
         default: "python"
         required: true
         scope: Instance
@@ -267,7 +267,7 @@ providers:
           groupName: Advanced
         description: "This plugin is written in python. Use this to define the python interpreter that is used to execute this plugin."
         type: Select
-        values: "python,python2,python3"
+        values: "python,python3"
         default: "python"
         required: true
         scope: Instance
@@ -285,7 +285,7 @@ providers:
         title: "API Version"
         description: "Kubernetes API Version"
         required: true
-        default: "extensions/v1beta1"
+        default: "apps/v1"
         renderingOptions:
           groupName: Metadata
       - name: name
@@ -476,7 +476,7 @@ providers:
           groupName: Advanced
         description: "This plugin is written in python. Use this to define the python interpreter that is used to execute this plugin."
         type: Select
-        values: "python,python2,python3"
+        values: "python,python3"
         default: "python"
         required: true
         scope: Instance
@@ -494,7 +494,7 @@ providers:
         title: "API Version"
         description: "Kubernetes API Version"
         required: true
-        default: "extensions/v1beta1"
+        default: "apps/v1"
         renderingOptions:
           groupName: Metadata
       - name: name
@@ -652,7 +652,7 @@ providers:
           groupName: Advanced
         description: "This plugin is written in python. Use this to define the python interpreter that is used to execute this plugin."
         type: Select
-        values: "python,python2,python3"
+        values: "python,python3"
         default: "python"
         required: true
         scope: Instance
@@ -727,7 +727,7 @@ providers:
           groupName: Advanced
         description: "This plugin is written in python. Use this to define the python interpreter that is used to execute this plugin."
         type: Select
-        values: "python,python2,python3"
+        values: "python,python3"
         default: "python"
         required: true
         scope: Instance
@@ -802,7 +802,7 @@ providers:
           groupName: Advanced
         description: "This plugin is written in python. Use this to define the python interpreter that is used to execute this plugin."
         type: Select
-        values: "python,python2,python3"
+        values: "python,python3"
         default: "python"
         required: true
         scope: Instance
@@ -877,7 +877,7 @@ providers:
           groupName: Advanced
         description: "This plugin is written in python. Use this to define the python interpreter that is used to execute this plugin."
         type: Select
-        values: "python,python2,python3"
+        values: "python,python3"
         default: "python"
         required: true
         scope: Instance
@@ -964,7 +964,7 @@ providers:
           groupName: Advanced
         description: "This plugin is written in python. Use this to define the python interpreter that is used to execute this plugin."
         type: Select
-        values: "python,python2,python3"
+        values: "python,python3"
         default: "python"
         required: true
         scope: Instance
@@ -1051,7 +1051,7 @@ providers:
           groupName: Advanced
         description: "This plugin is written in python. Use this to define the python interpreter that is used to execute this plugin."
         type: Select
-        values: "python,python2,python3"
+        values: "python,python3"
         default: "python"
         required: true
         scope: Instance
@@ -1135,7 +1135,7 @@ providers:
           groupName: Advanced
         description: "This plugin is written in python. Use this to define the python interpreter that is used to execute this plugin."
         type: Select
-        values: "python,python2,python3"
+        values: "python,python3"
         default: "python"
         required: true
         scope: Instance
@@ -1216,7 +1216,7 @@ providers:
           groupName: Advanced
         description: "This plugin is written in python. Use this to define the python interpreter that is used to execute this plugin."
         type: Select
-        values: "python,python2,python3"
+        values: "python,python3"
         default: "python"
         required: true
         scope: Instance
@@ -1369,7 +1369,7 @@ providers:
           groupName: Advanced
         description: "This plugin is written in python. Use this to define the python interpreter that is used to execute this plugin."
         type: Select
-        values: "python,python2,python3"
+        values: "python,python3"
         default: "python"
         required: true
         scope: Instance
@@ -1522,7 +1522,7 @@ providers:
           groupName: Advanced
         description: "This plugin is written in python. Use this to define the python interpreter that is used to execute this plugin."
         type: Select
-        values: "python,python2,python3"
+        values: "python,python3"
         default: "python"
         required: true
         scope: Instance
@@ -1597,7 +1597,7 @@ providers:
           groupName: Advanced
         description: "This plugin is written in python. Use this to define the python interpreter that is used to execute this plugin."
         type: Select
-        values: "python,python2,python3"
+        values: "python,python3"
         default: "python"
         required: true
         scope: Instance
@@ -1858,7 +1858,7 @@ providers:
           groupName: Advanced
         description: "This plugin is written in python. Use this to define the python interpreter that is used to execute this plugin."
         type: Select
-        values: "python,python2,python3"
+        values: "python,python3"
         default: "python"
         required: true
         scope: Instance
@@ -1933,7 +1933,7 @@ providers:
           groupName: Advanced
         description: "This plugin is written in python. Use this to define the python interpreter that is used to execute this plugin."
         type: Select
-        values: "python,python2,python3"
+        values: "python,python3"
         default: "python"
         required: true
         scope: Instance
@@ -2013,7 +2013,7 @@ providers:
           groupName: Advanced
         description: "This plugin is written in python. Use this to define the python interpreter that is used to execute this plugin."
         type: Select
-        values: "python,python2,python3"
+        values: "python,python3"
         default: "python"
         required: true
         scope: Instance
@@ -2106,7 +2106,7 @@ providers:
           groupName: Advanced
         description: "This plugin is written in python. Use this to define the python interpreter that is used to execute this plugin."
         type: Select
-        values: "python,python2,python3"
+        values: "python,python3"
         default: "python"
         required: true
         scope: Instance
@@ -2200,7 +2200,7 @@ providers:
           groupName: Advanced
         description: "This plugin is written in python. Use this to define the python interpreter that is used to execute this plugin."
         type: Select
-        values: "python,python2,python3"
+        values: "python,python3"
         default: "python"
         required: true
         scope: Instance
@@ -2393,7 +2393,7 @@ providers:
           groupName: Advanced
         description: "This plugin is written in python. Use this to define the python interpreter that is used to execute this plugin."
         type: Select
-        values: "python,python2,python3"
+        values: "python,python3"
         default: "python"
         required: true
         scope: Instance
@@ -2465,7 +2465,7 @@ providers:
           groupName: Advanced
         description: "This plugin is written in python. Use this to define the python interpreter that is used to execute this plugin."
         type: Select
-        values: "python,python2,python3"
+        values: "python,python3"
         default: "python"
         required: true
         scope: Instance
@@ -2556,7 +2556,7 @@ providers:
           groupName: Advanced
         description: "This plugin is written in python. Use this to define the python interpreter that is used to execute this plugin."
         type: Select
-        values: "python,python2,python3"
+        values: "python,python3"
         default: "python"
         required: true
         scope: Instance
@@ -2644,7 +2644,7 @@ providers:
           groupName: Advanced
         description: "This plugin is written in python. Use this to define the python interpreter that is used to execute this plugin."
         type: Select
-        values: "python,python2,python3"
+        values: "python,python3"
         default: "python"
         required: true
         scope: Instance
@@ -2738,7 +2738,7 @@ providers:
           groupName: Advanced
         description: "This plugin is written in python. Use this to define the python interpreter that is used to execute this plugin."
         type: Select
-        values: "python,python2,python3"
+        values: "python,python3"
         default: "python"
         required: true
         scope: Instance
@@ -2836,7 +2836,7 @@ providers:
           groupName: Advanced
         description: "This plugin is written in python. Use this to define the python interpreter that is used to execute this plugin."
         type: Select
-        values: "python,python2,python3"
+        values: "python,python3"
         default: "python"
         required: true
         scope: Instance

tox.ini

@@ -1,10 +1,9 @@
 # content of: tox.ini , put in same dir as setup.py
 [tox]
-envlist = py27, py36, py37, py38, py39, mypy
+envlist = py36, py37, py38, py39, mypy
 
 [gh-actions]
 python =
-    2.7: py27
     3.6: py36
     3.7: py37
     3.8: py38, mypy