May 2024 Dependabot version bumps (#95)

Signed-off-by: Michael Haigh <mhaigh@netapp.com>
NetApp · May 13, 2024 · 00b4708 · 00b4708
1 parent 634504e
commit 00b4708
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 58 deletions.
diff --git a/.github/workflows/manual-docker-min-publish.yml b/.github/workflows/manual-docker-min-publish.yml
@@ -8,24 +8,24 @@ on:
   workflow_dispatch:
     inputs:
       tag:
-        description: 'docker image tag'
+        description: "docker image tag"
         required: true
         type: string
 
 jobs:
   docker-image:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - name: Docker Setup Buildx
-      uses: docker/setup-buildx-action@v3.2.0
-    - name: Build and push the Docker image
-      env:
+      - uses: actions/checkout@v4
+      - name: Docker Setup Buildx
+        uses: docker/setup-buildx-action@v3.3.0
+      - name: Build and push the Docker image
+        env:
           DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
           DOCKERHUB_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
           DOCKERIMAGE_TAG: ${{ inputs.tag }}
-      run: |
-        docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
-        docker buildx build . --push --file Dockerfile.minimal \
-        --tag netapp/astra-toolkits:latest-minimal --tag netapp/astra-toolkits:$DOCKERIMAGE_TAG-minimal \
-        --platform linux/amd64,linux/arm64
+        run: |
+          docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
+          docker buildx build . --push --file Dockerfile.minimal \
+          --tag netapp/astra-toolkits:latest-minimal --tag netapp/astra-toolkits:$DOCKERIMAGE_TAG-minimal \
+          --platform linux/amd64,linux/arm64
diff --git a/.github/workflows/manual-docker-publish.yml b/.github/workflows/manual-docker-publish.yml
@@ -8,24 +8,24 @@ on:
   workflow_dispatch:
     inputs:
       tag:
-        description: 'docker image tag'
+        description: "docker image tag"
         required: true
         type: string
 
 jobs:
   docker-image:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - name: Docker Setup Buildx
-      uses: docker/setup-buildx-action@v3.2.0
-    - name: Build and push the Docker image
-      env:
+      - uses: actions/checkout@v4
+      - name: Docker Setup Buildx
+        uses: docker/setup-buildx-action@v3.3.0
+      - name: Build and push the Docker image
+        env:
           DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
           DOCKERHUB_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
           DOCKERIMAGE_TAG: ${{ inputs.tag }}
-      run: |
-        docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
-        docker buildx build . --push --file Dockerfile \
-        --tag netapp/astra-toolkits:latest --tag netapp/astra-toolkits:$DOCKERIMAGE_TAG \
-        --platform linux/amd64,linux/arm64
+        run: |
+          docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
+          docker buildx build . --push --file Dockerfile \
+          --tag netapp/astra-toolkits:latest --tag netapp/astra-toolkits:$DOCKERIMAGE_TAG \
+          --platform linux/amd64,linux/arm64
diff --git a/.github/workflows/python-docker-publish.yml b/.github/workflows/python-docker-publish.yml
@@ -7,51 +7,50 @@ name: Python and Docker CI
 on:
   push:
     tags:
-      - '*.*.*'
+      - "*.*.*"
 
 jobs:
-
   python-package:
     runs-on: ubuntu-latest
     permissions:
       id-token: write
     steps:
-    - uses: actions/checkout@v4
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: '3.x'
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install build
-    - name: Build package
-      run: python -m build --wheel
-    - name: Publish package
-      uses: pypa/gh-action-pypi-publish@81e9d935c883d0b210363ab89cf05f3894778450
+      - uses: actions/checkout@v4
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.x"
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install build
+      - name: Build package
+        run: python -m build --wheel
+      - name: Publish package
+        uses: pypa/gh-action-pypi-publish@81e9d935c883d0b210363ab89cf05f3894778450
 
   docker-image:
     needs: python-package
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - name: Set tag output
-      id: vars
-      run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
-    - name: wait for actoolkit
-      run: sleep 300
-    - name: Docker Setup Buildx
-      uses: docker/setup-buildx-action@v3.2.0
-    - name: Build and push the Docker images
-      env:
+      - uses: actions/checkout@v4
+      - name: Set tag output
+        id: vars
+        run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
+      - name: wait for actoolkit
+        run: sleep 300
+      - name: Docker Setup Buildx
+        uses: docker/setup-buildx-action@v3.3.0
+      - name: Build and push the Docker images
+        env:
           DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
           DOCKERHUB_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
           DOCKERIMAGE_TAG: ${{ steps.vars.outputs.tag }}
-      run: |
-        docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
-        docker buildx build . --push --file Dockerfile \
-        --tag netapp/astra-toolkits:latest --tag netapp/astra-toolkits:$DOCKERIMAGE_TAG \
-        --platform linux/amd64,linux/arm64
-        docker buildx build . --push --file Dockerfile.minimal \
-        --tag netapp/astra-toolkits:latest-minimal --tag netapp/astra-toolkits:$DOCKERIMAGE_TAG-minimal \
-        --platform linux/amd64,linux/arm64
+        run: |
+          docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
+          docker buildx build . --push --file Dockerfile \
+          --tag netapp/astra-toolkits:latest --tag netapp/astra-toolkits:$DOCKERIMAGE_TAG \
+          --platform linux/amd64,linux/arm64
+          docker buildx build . --push --file Dockerfile.minimal \
+          --tag netapp/astra-toolkits:latest-minimal --tag netapp/astra-toolkits:$DOCKERIMAGE_TAG-minimal \
+          --platform linux/amd64,linux/arm64
diff --git a/Dockerfile.minimal b/Dockerfile.minimal
@@ -1,4 +1,4 @@
-FROM python:3.12.2-alpine3.19
+FROM python:3.12.3-alpine3.19
 RUN apk add --no-cache jq
 RUN pip install actoolkit
 CMD ["/bin/sh"]
diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,6 @@
 Jinja2>=3.1.2
-kubernetes>=24.2.0,<=27.2.0
+kubernetes>=25.3.0,<=29.0.0
 PyYAML>=6.0.0,<=6.0.1
 requests==2.31.0
 tabulate>=0.8.9,<=0.9.0
-urllib3>=1.26.8,<=2.1.0
+urllib3>=1.26.8,<=2.2.1