MGMT-1163 Added skipper build

Added python requirements and dev-requirements
Added pylint and pep3 checks
Fixed pep and pylint errors
Renamed the python file to render_files.py
Removed deprecated dockerfile

f

Dockerfile.build

@@ -0,0 +1,9 @@
+FROM python:3
+
+COPY requirements.txt /tmp/requirements.txt
+RUN pip install -r /tmp/requirements.txt
+
+COPY dev-requirements.txt /tmp/dev-requirements.txt
+RUN pip install -r /tmp/dev-requirements.txt
+
+RUN rm /tmp/*requirements.txt

Dockerfile.baremetal → Dockerfile.ignition-manifests-and-kubeconfig-generate

@@ -18,9 +18,9 @@ RUN chmod 777 $WORK_DIR
 
 # [TODO] - change this line to use openshift-installer from the release, once we are ready
 COPY --from=0 /root/installer/openshift-install $WORK_DIR
-COPY ./process-ignition-manifests-and-kubeconfig.py $WORK_DIR
+COPY ./render_files.py $WORK_DIR
 
 ENV WORK_DIR=$WORK_DIR
 
-ENV EXEC_PATH=$WORK_DIR/process-ignition-manifests-and-kubeconfig.py
-ENTRYPOINT python $EXEC_PATH
+ENV EXEC_PATH=$WORK_DIR/render_files.py
+ENTRYPOINT python $EXEC_PATH

Dockerfile.installer-image

@@ -1,3 +1,5 @@
+#This dockerfile require an openshift installer binary in CWD
 FROM alpine:latest
 RUN mkdir /root/installer
 COPY ./openshift-install /root/installer
+

Makefile

@@ -0,0 +1,7 @@
+all: pep8 pylint build
+
+build:
+	skipper build ignition-manifests-and-kubeconfig-generate
+
+.DEFAULT:
+	skipper -v $(MAKE) $@

Makefile.skipper

@@ -0,0 +1,14 @@
+all: pep8 pylint
+
+pep8:
+	pep8 --max-line-length=145 render_files.py
+
+pylint:
+	mkdir -p reports
+	PYLINTHOME=reports/ pylint render_files.py
+
+clean:
+	rm -rf build dist *egg-info ./__pycache__
+	find -name *.pyc -delete
+
+.PHONY: pep8 pylint clean

dev-requirements.txt

@@ -0,0 +1,2 @@
+pep8
+pylint

process-ignition-manifests-and-kubeconfig.py → render_files.py

@@ -1,34 +1,31 @@
 #!/usr/bin/env python
 
+import argparse
+import json
+import logging
 import subprocess
-import random
+import sys
 import os
 import boto3
 from botocore.exceptions import NoCredentialsError
-from base64 import b64decode
-import logging
-import argparse
-import sys
-import json
 
 
 def get_s3_client(s3_endpoint_url):
+    aws_access_key_id = os.environ.get("aws_access_key_id", "accessKey1")
+    aws_secret_access_key = os.environ.get("aws_secret_access_key", "verySecretKey1")
 
-        aws_access_key_id = os.environ.get("aws_access_key_id", "accessKey1")
-        aws_secret_access_key = os.environ.get("aws_secret_access_key", "verySecretKey1")
-
-        s3 = boto3.client(
-            's3',
-            aws_access_key_id=aws_access_key_id,
-            aws_secret_access_key=aws_secret_access_key,
-            endpoint_url=s3_endpoint_url
-        )
-        return s3
+    s3_client = boto3.client(
+        's3',
+        aws_access_key_id=aws_access_key_id,
+        aws_secret_access_key=aws_secret_access_key,
+        endpoint_url=s3_endpoint_url
+    )
+    return s3_client
 
 
-def upload_to_aws(s3, local_file, bucket, s3_file):
+def upload_to_aws(s3_client, local_file, bucket, s3_file):
     try:
-        s3.upload_file(local_file, bucket, s3_file, ExtraArgs={'ACL': 'public-read'})
+        s3_client.upload_file(local_file, bucket, s3_file, ExtraArgs={'ACL': 'public-read'})
         print("Upload Successful")
         return True
     except NoCredentialsError:
@@ -38,43 +35,43 @@ def upload_to_aws(s3, local_file, bucket, s3_file):
 
 def remove_bmo_provisioning(ignition_file):
     found = False
-    with open(ignition_file, "r") as f:
-        data = json.load(f)
-        storageFiles = data['storage']['files']
+    with open(ignition_file, "r") as file_obj:
+        data = json.load(file_obj)
+        storage_files = data['storage']['files']
         # Iterate through a copy of the list
-        for fileData in storageFiles[:]:
-            if 'baremetal-provisioning-config' in fileData['path']:
-                storageFiles.remove(fileData)
+        for file_data in storage_files[:]:
+            if 'baremetal-provisioning-config' in file_data['path']:
+                storage_files.remove(file_data)
                 found = True
                 break
     if found:
-        with open(ignition_file,"w") as f:
-            json.dump(data, f)
+        with open(ignition_file, "w") as file_obj:
+            json.dump(data, file_obj)
 
 
 def upload_to_s3(s3_endpoint_url, bucket, install_dir):
-    s3 = get_s3_client(s3_endpoint_url)
+    s3_client = get_s3_client(s3_endpoint_url)
     prefix = os.environ.get("CLUSTER_ID")
 
     for root, _, files in os.walk(install_dir):
-        for f in files:
-            logging.info("Uplading file: {}".format(f))
-            file_path = os.path.join(root, f)
-            if f == "kubeconfig":
-                f = "kubeconfig-noingress"
-            s3_file_name = "{}/{}".format(prefix, f)
+        for file_name in files:
+            logging.info("Uploading file: %s", file_name)
+            file_path = os.path.join(root, file_name)
+            if file_name == "kubeconfig":
+                file_name = "kubeconfig-noingress"
+            s3_file_name = "{}/{}".format(prefix, file_name)
             print(s3_file_name)
-            uploaded = upload_to_aws(s3, file_path, bucket, s3_file_name)
+            upload_to_aws(s3_client, file_path, bucket, s3_file_name)
 
 
 def debug_print_upload_to_s3(install_dir):
     prefix = "dummy_cluster_id"
     for root, _, files in os.walk(install_dir):
-        for f in files:
-            file_path = os.path.join(root, f)
-            if f == "kubeconfig":
-                f = "kubeconfig-noingress"
-            s3_file_name = "{}/{}".format(prefix, f)
+        for file_name in files:
+            file_path = os.path.join(root, file_name)
+            if file_name == "kubeconfig":
+                file_name = "kubeconfig-noingress"
+            s3_file_name = "{}/{}".format(prefix, file_name)
             print("Uploading file %s as object %s" % (file_path, s3_file_name))
 
 
@@ -92,9 +89,8 @@ def main():
     config_dir = os.path.join(work_dir, "installer_dir")
     if install_config:
         subprocess.check_output(["mkdir", "-p", config_dir])
-        with open(os.path.join(config_dir, 'install-config.yaml'), 'w+') as f:
-                f.write(install_config)
-
+        with open(os.path.join(config_dir, 'install-config.yaml'), 'w+') as file_obj:
+            file_obj.write(install_config)
     if not os.path.isdir(config_dir):
         raise Exception('installer directory is not mounted')
 
@@ -107,7 +103,6 @@ def main():
     except Exception as ex:
         raise Exception('Failed to generate files, exception: {}'.format(ex))
 
-
     try:
         remove_bmo_provisioning("%s/bootstrap.ign" % config_dir)
     except Exception as ex:

requirements.txt

@@ -0,0 +1,2 @@
+boto3
+botocore

skipper.yaml

@@ -0,0 +1,3 @@
+build-container-image: build
+make:
+  makefile: Makefile.skipper