From adc0a45089d649af1b27282cf9f20deb5643b0bc Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Tue, 26 Mar 2024 08:45:42 +0100 Subject: [PATCH 1/3] feat: add metallb crds --- Makefile | 2 ++ generate.sh | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/Makefile b/Makefile index 5bab26e..2fbdb65 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,8 @@ CNPG_VERSION := v1.22.2 MINIO_VERSION := v5.0.14 # renovate: datasource=helm depName=k8up registryUrl=https://k8up-io.github.io/k8up K8UP_VERSION := 4.5.0 +# renovate: datasource=github-releases depName=metallb/metallb +METALLB_VERSION := v0.14.2 .PHONY: all all: clean generate diff --git a/generate.sh b/generate.sh index e2c28a4..42b436a 100755 --- a/generate.sh +++ b/generate.sh @@ -109,3 +109,10 @@ NAME=k8up WORKDIR="${TMP_CRD_DIR}/$NAME" SOURCE="https://github.com/k8up-io/k8up/releases/download/k8up-${K8UP_VERSION}/k8up-crd.yaml" default_openapi_handler + +# Metallb +API=metallb.io +NAME=metallb +WORKDIR="${TMP_CRD_DIR}/$NAME" +SOURCE="https://raw.githubusercontent.com/metallb/metallb/${METALLB_VERSION}/charts/metallb/charts/crds/templates/crds.yaml" +default_openapi_handler -- 2.24.4 From 950b86895d4adbb306778e06e4641908b86c9e10 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Tue, 26 Mar 2024 09:19:42 +0100 Subject: [PATCH 2/3] fix source --- generate.sh | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/generate.sh b/generate.sh index 42b436a..1bf0933 100755 --- a/generate.sh +++ b/generate.sh @@ -82,6 +82,32 @@ for FILE in "${WORKDIR}"/*.json; do generate_all "$TARGET_DIR" done +## Metallb +API=metallb.io +NAME=metallb +WORKDIR="${TMP_CRD_DIR}/$NAME" +SOURCE="https://raw.githubusercontent.com/metallb/metallb/${METALLB_VERSION}/charts/metallb/charts/crds/templates/crds.yaml" + +printf "Processing %s ...\n" $API +mkdir -p "${WORKDIR}" +curl -SsfL -o "${WORKDIR}/${NAME}.crds.yaml" "${SOURCE}" +( + cd "$WORKDIR" + yq --inplace 'del(.spec.conversion)' "${NAME}.crds.yaml" + openapi2jsonschema "${NAME}.crds.yaml" >/dev/null +) + +TARGET_DIR="$DIST/$API" +mkdir -p "$TARGET_DIR" + +for FILE in "${WORKDIR}"/*.json; do + FILENAME=$(basename "$FILE") + + mv "$FILE" "$TARGET_DIR/$FILENAME" +done + +generate_all "$TARGET_DIR" + ## Cloudnative-PG API=postgresql.cnpg.io NAME=cnpg @@ -103,16 +129,9 @@ WORKDIR="${TMP_CRD_DIR}/$NAME" SOURCE="https://raw.githubusercontent.com/minio/operator/${MINIO_VERSION}/resources/base/crds/minio.min.io_tenants.yaml" default_openapi_handler -# K8up +## K8up API=k8up.io NAME=k8up WORKDIR="${TMP_CRD_DIR}/$NAME" SOURCE="https://github.com/k8up-io/k8up/releases/download/k8up-${K8UP_VERSION}/k8up-crd.yaml" default_openapi_handler - -# Metallb -API=metallb.io -NAME=metallb -WORKDIR="${TMP_CRD_DIR}/$NAME" -SOURCE="https://raw.githubusercontent.com/metallb/metallb/${METALLB_VERSION}/charts/metallb/charts/crds/templates/crds.yaml" -default_openapi_handler -- 2.24.4 From 918d228f716f67fc905316fdfbe1598a870f30aa Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Tue, 26 Mar 2024 09:44:05 +0100 Subject: [PATCH 3/3] use kube-tools image --- .woodpecker/build-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/build-package.yml b/.woodpecker/build-package.yml index 7a9093e..33551d9 100644 --- a/.woodpecker/build-package.yml +++ b/.woodpecker/build-package.yml @@ -7,7 +7,7 @@ when: steps: - name: build - image: quay.io/thegeeklab/alpine-tools + image: quay.io/thegeeklab/kube-tools commands: - make -- 2.24.4