build: Attempt to fix CI build errors

Author: Alan Christie

.github/workflows/build-latest.yaml

@@ -36,7 +36,7 @@ jobs:
         python-version: '3.10'
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
+        pip install --upgrade pip
         pip install -r build-requirements.txt
         pip install -r requirements.txt
         ansible-galaxy install -r requirements.yaml

.github/workflows/build.yaml

@@ -38,7 +38,7 @@ jobs:
         python-version: '3.10'
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
+        pip install --upgrade pip
         pip install -r build-requirements.txt
         pip install -r requirements.txt
         ansible-galaxy install -r requirements.yaml

.pre-commit-config.yaml

@@ -1,5 +1,5 @@
 ---
-minimum_pre_commit_version: 2.18.1
+minimum_pre_commit_version: 3.3.3
 
 repos:
 
@@ -8,7 +8,7 @@ repos:
 
 # Conventional Commit message checker (commitizen)
 - repo: https://github.com/commitizen-tools/commitizen
-  rev: v2.23.0
+  rev: v3.5.3
   hooks:
   - id: commitizen
     stages:
@@ -19,7 +19,7 @@ repos:
 
 # Standard pre-commit rules
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.1.0
+  rev: v4.4.0
   hooks:
   - id: check-case-conflict
   - id: check-docstring-first
@@ -32,21 +32,21 @@ repos:
     - --markdown-linebreak-ext=md
 # Black (uncompromising) Python code formatter
 - repo: https://github.com/psf/black
-  rev: 22.3.0
+  rev: 23.7.0
   hooks:
   - id: black
     args:
     - --target-version
     - py39
 # MyPy
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v0.942
+  rev: v1.4.1
   hooks:
   - id: mypy
     files: ^operator
 # Pylint
 - repo: https://github.com/pycqa/pylint
-  rev: v2.13.5
+  rev: v2.17.4
   hooks:
   - id: pylint
     files: ^operator
@@ -57,7 +57,7 @@ repos:
 # All files that end '.yaml' or '.yaml.j2'
 # See https://pre-commit.com/#filtering-files-with-types
 - repo: https://github.com/adrienverge/yamllint
-  rev: v1.26.3
+  rev: v1.32.0
   hooks:
   - id: yamllint
     types:

README.md

@@ -58,15 +58,19 @@ current health of your clone with: -
     pre-commit run --all-files
 
 ## Building the operator (local development)
+Pre-requisites: -
+
+- Docker Compose (v2)
+
 The operator container, residing in the `operator` directory,
 is automatically built and pushed to Docker Hub using GitHub Actions.
 
 You can build and push the image yourself using docker-compose.
 The following will build an operator image with the tag `19.2.0-alpha.1`: -
 
     export IMAGE_TAG=19.2.0-alpha.1
-    docker-compose build
-    docker-compose push
+    docker compose build
+    docker compose push
 
 ## Deploying into the Data Manager API
 We use [Ansible] 3 and community modules in [Ansible Galaxy] as the deployment

build-requirements.txt

@@ -1,6 +1,6 @@
-ansible-lint == 6.0.2
-black == 22.3.0
-mypy == 0.942
-pre-commit == 2.18.1
-pylint == 2.13.5
-yamllint == 1.26.3
+ansible-lint == 6.17.2
+black == 23.7.0
+mypy == 1.4.1
+pre-commit == 3.3.3
+pylint == 2.17.4
+yamllint == 1.32.0

docker-compose.yaml

@@ -13,8 +13,8 @@
 #
 # i.e.: -
 #
-#   IMAGE_TAG=19.3.0-alpha.1 docker-compose build
-#   IMAGE_TAG=19.3.0-alpha.1 docker-compose push
+#   IMAGE_TAG=19.3.0-alpha.1 docker compose build
+#   IMAGE_TAG=19.3.0-alpha.1 docker compose push
 
 version: '3.8'
 

requirements.txt

@@ -1,3 +1,2 @@
-ansible == 4.10.0
-docker-compose == 1.29.2
+ansible == 8.2.0
 openshift == 0.13.1

roles/operator/tasks/dm.yaml

@@ -3,11 +3,15 @@
 # A ply to deploy objects to the chosen Data Manager namespace.
 # In this case it's a Role and RoleBinding
 
-- include_tasks: prep.yaml
+- name: Prep
+  ansible.builtin.include_tasks: prep.yaml
 
 # Check the Data Manager Namespace and Service Account exists...
 
 - name: Deploy DataManager RBAC objects
+  module_defaults:
+    group/k8s:
+      kubeconfig: "{{ jo_kubeconfig }}"
   block:
 
   - name: Get Data Manager Namespace ({{ jo_dmapi_namespace }})
@@ -17,7 +21,7 @@
     register: ns_result
 
   - name: Assert Namespace ({{ jo_dmapi_namespace }})
-    assert:
+    ansible.builtin.assert:
       that:
       - ns_result.resources|length == 1
 
@@ -29,7 +33,7 @@
     register: sa_result
 
   - name: Assert ServiceAccount
-    assert:
+    ansible.builtin.assert:
       that:
       - sa_result.resources|length == 1
 
@@ -40,7 +44,3 @@
     loop:
     - rbac-data-manager
     - configmap-data-manager
-
-  module_defaults:
-    group/k8s:
-      kubeconfig: "{{ jo_kubeconfig }}"

roles/operator/tasks/main.yaml

@@ -1,21 +1,23 @@
 ---
 
-- include_tasks: prep.yaml
+- name: Prep
+  ansible.builtin.include_tasks: prep.yaml
 
 - name: Assert operator version defined
-  assert:
+  ansible.builtin.assert:
     that:
     - jo_image_tag|length > 0
     - jo_image_tag != 'SetMe'
 
 - name: Deploy using Kubernetes config
+  module_defaults:
+    group/k8s:
+      kubeconfig: "{{ jo_kubeconfig }}"
   block:
 
-  - include_tasks: deploy.yaml
+  - name: Deploy
+    ansible.builtin.include_tasks: deploy.yaml
     when: jo_state|string == 'present'
-  - include_tasks: undeploy.yaml
+  - name: Undeploy
+    ansible.builtin.include_tasks: undeploy.yaml
     when: jo_state|string == 'absent'
-
-  module_defaults:
-    group/k8s:
-      kubeconfig: "{{ jo_kubeconfig }}"

roles/operator/tasks/prep.yaml

@@ -4,22 +4,22 @@
 
 # Expose ansible version
 - name: Display Ansible version
-  debug:
+  ansible.builtin.debug:
     var: ansible_version.full
 
 # Expose all the installed Python modules...
 
 - name: Capture pip freeze
-  command: pip freeze
+  ansible.builtin.command: pip freeze
   register: freeze
   changed_when: false
 
 - name: Display pip freeze
-  debug:
+  ansible.builtin.debug:
     var: freeze.stdout_lines
 
 - name: Assert kubeconfig defined
-  assert:
+  ansible.builtin.assert:
     that:
     - jo_kubeconfig|length > 0
     - jo_kubeconfig != 'SetMe'