Merge branch 'development' into 'master'

Development

See merge request !27

Dockerfile

@@ -11,10 +11,10 @@ ARG spark_uid=185
 
 USER root
 
-COPY pip-21.1.1-py3-none-any.whl setuptools-53.0.0-py3-none-any.whl ./
+COPY *.whl ./
 
 RUN dnf -y update && dnf -y upgrade && \
-    pip3 install --upgrade ./pip-21.1.1-py3-none-any.whl ./setuptools-53.0.0-py3-none-any.whl && \
+    pip3 install --upgrade ./*.whl && \
     rm -rf /var/cache/dnf && \
     mkdir -p /opt/spark/python/pyspark && \
     mkdir -p /opt/spark/python/lib && \

hardening_manifest.yaml

@@ -8,7 +8,7 @@ name: "opensource/spark-operator/spark-py"
 # The most specific version should be the first tag and will be shown
 # on ironbank.dsop.io
 tags:
-- "v2.4.5"
+- "v3.1.1"
 - "latest"
 
 # Build args passed to Dockerfile ARGs
@@ -27,7 +27,7 @@ labels:
   org.opencontainers.image.url: "https://spark.apache.org/docs/latest/index.html"
   # Name of the distributing entity, organization or individual
   org.opencontainers.image.vendor: "Apache Software Foundation"
-  org.opencontainers.image.version: "v2.4.5"
+  org.opencontainers.image.version: "v3.1.1"
   # Keywords to help with search (ex. "cicd,gitops,golang")
   mil.dso.ironbank.image.keywords: "apache,python,data processing,large scale,hadoop,kubeflow"
   # This value can be "opensource" or "commercial"
@@ -39,16 +39,16 @@ labels:
 resources:
   - url: "docker://gcr.io/spark-operator/spark-py@sha256:c1f21b8b6f4f0ad7b25177ad086b7eaf7d96747940b0fe2e8dc6ca688c85db76"
     tag: "spark-operator/spark-py:2.4.5"
-  - filename: pip-21.1.1-py3-none-any.whl
-    url: https://files.pythonhosted.org/packages/cd/6f/43037c7bcc8bd8ba7c9074256b1a11596daa15555808ec748048c1507f08/pip-21.1.1-py3-none-any.whl
+  - filename: pip-21.2.4-py3-none-any.whl
+    url: https://files.pythonhosted.org/packages/ca/31/b88ef447d595963c01060998cb329251648acf4a067721b0452c45527eb8/pip-21.2.4-py3-none-any.whl
     validation:
       type: sha256
-      value: 11d095ed5c15265fc5c15cc40a45188675c239fb0f9913b673a33e54ff7d45f0
-  - filename: setuptools-53.0.0-py3-none-any.whl
-    url: https://files.pythonhosted.org/packages/15/0e/255e3d57965f318973e417d5b7034223f1223de500d91b945ddfaef42a37/setuptools-53.0.0-py3-none-any.whl
+      value: fa9ebb85d3fd607617c0c44aca302b1b45d87f9c2a1649b46c26167ca4296323
+  - filename: setuptools-57.4.0-py3-none-any.whl
+    url: https://files.pythonhosted.org/packages/bd/25/5bdf7f1adeebd4e3fa76b2e2f045ae53ee208e40a4231ad0f0c3007e4353/setuptools-57.4.0-py3-none-any.whl
     validation:
       type: sha256
-      value: 0e86620d658c5ca87a71a283bd308fcaeb4c33e17792ef6f081aec17c171347f
+      value: a49230977aa6cfb9d933614d2f7b79036e9945c4cdd7583163f4e920b83418d6
   - filename: tini
     url: https://github.com/krallin/tini/releases/download/v0.19.0/tini
     validation:

renovate.json

@@ -5,6 +5,8 @@
   "baseBranches": [
     "development"
   ],
+  "automerge": true,
+  "gitLabAutomerge": true,
   "regexManagers": [
     {
       "fileMatch": [