From cd8e568cb345ae726bd1db0582c0de3aed696d24 Mon Sep 17 00:00:00 2001
From: Noel Georgi <git@frezbo.dev>
Date: Tue, 5 Nov 2024 17:14:19 +0530
Subject: [PATCH] chore: bump deps

Drop Azure and Gcloud cli, CI doesn't use them anymore.

Migrate renovate config to new schema.

Signed-off-by: Noel Georgi <git@frezbo.dev>
---
 .github/renovate.json | 20 +++++++++++---------
 Dockerfile            | 25 ++++---------------------
 hack/scripts/setup-ci |  2 +-
 3 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/.github/renovate.json b/.github/renovate.json
index aa0b238..376e1f0 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -7,8 +7,9 @@
         "schedule:earlyMondays"
     ],
     "prHeader": "Update Request | Renovate Bot",
-    "regexManagers": [
+    "customManagers": [
         {
+            "customType": "regex",
             "fileMatch": [
                 "^Dockerfile$"
             ],
@@ -18,6 +19,7 @@
             "versioningTemplate": "{{#if versioning}}{{versioning}}{{else}}semver{{/if}}"
         },
         {
+            "customType": "regex",
             "fileMatch": [
                 "^hack/scripts/setup-"
             ],
@@ -29,25 +31,25 @@
     ],
     "packageRules": [
         {
-            "matchPackagePatterns": [
-                "*"
-            ],
             "matchDatasources": [
                 "docker"
             ],
-            "groupName": "container images"
+            "groupName": "container images",
+            "matchPackageNames": [
+                "*"
+            ]
         },
         {
-            "matchPackagePatterns": [
-                "*"
-            ],
             "matchDatasources": [
                 "git-refs",
                 "git-tags",
                 "github-tags",
                 "github-releases"
             ],
-            "groupName": "releases"
+            "groupName": "releases",
+            "matchPackageNames": [
+                "*"
+            ]
         }
     ]
 }
diff --git a/Dockerfile b/Dockerfile
index 9c2d5d2..54ac1ce 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,20 +1,14 @@
-ARG DOCKER=docker:27.2.1-dind
+ARG DOCKER=docker:27.3.1-dind
 
 FROM $DOCKER AS docker
 
 FROM alpine:3.20.3 AS build-container-drone
 
-# https://github.com/twistedpair/google-cloud-sdk/ is a mirror that replicates the gcloud sdk versions
-# renovate: datasource=github-tags depName=twistedpair/google-cloud-sdk
-ARG CLOUD_SDK_VERSION=492.0.0
 # renovate: datasource=github-releases depName=docker/buildx
-ARG BUILDX_VERSION=v0.17.1
+ARG BUILDX_VERSION=v0.18.0
 # renovate: datasource=github-releases extractVersion=^v(?<version>.*)$ depName=hashicorp/terraform
 ARG TERRAFORM_VERSION=1.7.3
 
-# janky janky janky
-ENV PATH /google-cloud-sdk/bin:$PATH
-
 RUN apk add --update --no-cache \
   aws-cli \
   bash \
@@ -58,17 +52,6 @@ RUN apk add --update --no-cache \
 # workaround, install older OVMF version from Alpine 3.18
 RUN apk add --no-cache ovmf=0.0.202302-r0 --repository=https://dl-cdn.alpinelinux.org/alpine/v3.18/community
 
-# Install gcloud
-RUN curl -O https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-${CLOUD_SDK_VERSION}-linux-x86_64.tar.gz && \
-  tar xzf google-cloud-sdk-${CLOUD_SDK_VERSION}-linux-x86_64.tar.gz && \
-  rm google-cloud-sdk-${CLOUD_SDK_VERSION}-linux-x86_64.tar.gz && \
-  gcloud config set core/disable_usage_reporting true && \
-  gcloud config set component_manager/disable_update_check true && \
-  gcloud config set metrics/environment github_docker_image
-
-# Install azure
-RUN pip3 install azure-cli --break-system-packages
-
 # Required by docker-compose for zlib.
 ENV LD_LIBRARY_PATH=/lib:/usr/lib
 
@@ -98,9 +81,9 @@ ARG CRANE_VERSION=v0.20.2
 # renovate: datasource=github-releases depName=mikefarah/yq
 ARG YQ_VERSION=v4.44.3
 # renovate: datasource=github-releases depName=getsops/sops
-ARG SOPS_VERSION=v3.9.0
+ARG SOPS_VERSION=v3.9.1
 # renovate: datasource=github-tags depName=aws/aws-cli
-ARG AWSCLI_VERSION=2.17.51
+ARG AWSCLI_VERSION=2.19.1
 USER root
 RUN apt update && \
 	apt upgrade -y && \
diff --git a/hack/scripts/setup-ci b/hack/scripts/setup-ci
index b9ae924..a9b1515 100755
--- a/hack/scripts/setup-ci
+++ b/hack/scripts/setup-ci
@@ -5,7 +5,7 @@ set -ex
 export TAG=$(git log --oneline --format=%B -n 1 HEAD | head -n 1 | sed -r "/^release\(/ s/^release\((.*)\):.*$/\\1/; t; Q")
 
 # renovate: datasource=github-releases depName=moby/buildkit
-BUILDKIT_IMAGE="docker.io/moby/buildkit:v0.16.0"
+BUILDKIT_IMAGE="docker.io/moby/buildkit:v0.17.0"
 
 # setup buildkit across amd64/arm64 workers
 function setup_buildkit() {