From 7597632eff1ba3187ea5b7c060da5a49e1c1f1fd Mon Sep 17 00:00:00 2001 From: yiannistri <8741709+yiannistri@users.noreply.github.com> Date: Tue, 14 Jan 2025 12:17:05 +0000 Subject: [PATCH 1/3] ci: Use supported version for e2e tests (cherry picked from commit 653391e7492a8620f821a33eda8b1deb3e5c2331) --- test/e2e/templates/basic-cluster.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/templates/basic-cluster.yaml b/test/e2e/templates/basic-cluster.yaml index 916e82f..d036c01 100644 --- a/test/e2e/templates/basic-cluster.yaml +++ b/test/e2e/templates/basic-cluster.yaml @@ -8,7 +8,7 @@ spec: labels: {} region: "us-west1" projectID: "${GKE_PROJECT_ID}" - kubernetesVersion: "1.28.15-gke.1388000" + kubernetesVersion: "1.28.15-gke.1480000" loggingService: "" monitoringService: "" enableKubernetesAlpha: false @@ -23,7 +23,7 @@ spec: labels: {} initialNodeCount: 1 maxPodsConstraint: 110 - version: "1.28.15-gke.1388000" + version: "1.28.15-gke.1480000" management: autoRepair: true autoUpgrade: true From a99f886f8fbd5d4869f95a8d1067f815e702a939 Mon Sep 17 00:00:00 2001 From: yiannistri <8741709+yiannistri@users.noreply.github.com> Date: Tue, 14 Jan 2025 12:17:31 +0000 Subject: [PATCH 2/3] fix: Bump ginkgo version (cherry picked from commit 8dc9e7864c74e0d46f4ddd42de254055e7b92b73) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 56adb4f..f3c78c7 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ MOCKGEN_VER := v1.6.0 MOCKGEN_BIN := mockgen MOCKGEN := $(BIN_DIR)/$(MOCKGEN_BIN)-$(MOCKGEN_VER) -GINKGO_VER := v2.20.2 +GINKGO_VER := v2.22.2 GINKGO_BIN := ginkgo GINKGO := $(BIN_DIR)/$(GINKGO_BIN)-$(GINKGO_VER) From 3a8535e240d62c50521218f64f95d18b412f0a95 Mon Sep 17 00:00:00 2001 From: yiannistri <8741709+yiannistri@users.noreply.github.com> Date: Tue, 14 Jan 2025 12:32:59 +0000 Subject: [PATCH 3/3] fix: Remove obsolete files (cherry picked from commit c5ed2d16b93bc0b65981ed17afc1a1714c4362d7) --- .drone.yml | 150 ---------------------------------------------- Dockerfile.dapper | 31 ---------- Makefile | 12 ---- scripts/entry | 11 ---- 4 files changed, 204 deletions(-) delete mode 100644 .drone.yml delete mode 100644 Dockerfile.dapper delete mode 100755 scripts/entry diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index c0e312d..0000000 --- a/.drone.yml +++ /dev/null @@ -1,150 +0,0 @@ ---- -kind: pipeline -name: linux-amd64 - -platform: - os: linux - arch: amd64 - -steps: -- name: ci - image: rancher/dapper:v0.5.4 - commands: - - dapper ci - volumes: - - name: docker - path: /var/run/docker.sock - when: - event: - - push - - pull_request - - tag - -- name: docker-publish - image: plugins/docker - settings: - dockerfile: package/Dockerfile - username: - from_secret: docker_username - password: - from_secret: docker_password - repo: "rancher/gke-operator" - tag: "${DRONE_TAG}-amd64" - when: - event: - - tag - -- name: docker-build - image: plugins/docker - settings: - dockerfile: package/Dockerfile - repo: "rancher/gke-operator" - tag: "${DRONE_COMMIT}-amd64" - dry_run: true - when: - event: - - pull_request - -volumes: -- name: docker - host: - path: /var/run/docker.sock - ---- - -kind: pipeline -name: linux-arm64 - -platform: - os: linux - arch: arm64 - -steps: -- name: ci - image: rancher/dapper:v0.5.4 - commands: - - dapper ci - volumes: - - name: docker - path: /var/run/docker.sock - when: - event: - - push - - pull_request - - tag - -- name: docker-publish - image: plugins/docker - settings: - dockerfile: package/Dockerfile - username: - from_secret: docker_username - password: - from_secret: docker_password - repo: "rancher/gke-operator" - tag: "${DRONE_TAG}-arm64" - when: - event: - - tag - -- name: docker-build - image: plugins/docker - settings: - dockerfile: package/Dockerfile - repo: "rancher/gke-operator" - tag: "${DRONE_COMMIT}-arm64" - dry_run: true - when: - event: - - pull_request - -volumes: -- name: docker - host: - path: /var/run/docker.sock - ---- - -kind: pipeline -name: manifest - -platform: - os: linux - arch: amd64 - -steps: -- name: manifest - image: plugins/manifest:1.0.2 - settings: - username: - from_secret: docker_username - password: - from_secret: docker_password - platforms: - - linux/amd64 - - linux/arm64 - target: "rancher/gke-operator:${DRONE_TAG}" - template: "rancher/gke-operator:${DRONE_TAG}-ARCH" - when: - event: - - tag - -depends_on: -- linux-amd64 -- linux-arm64 - ---- - -kind: pipeline -name: fossa - -steps: -- name: fossa - image: rancher/drone-fossa:latest - settings: - api_key: - from_secret: FOSSA_API_KEY - when: - instance: - - drone-publish.rancher.io - diff --git a/Dockerfile.dapper b/Dockerfile.dapper deleted file mode 100644 index addd91e..0000000 --- a/Dockerfile.dapper +++ /dev/null @@ -1,31 +0,0 @@ -FROM registry.suse.com/bci/bci-base:15.6 - -ARG DAPPER_HOST_ARCH -ENV ARCH=${DAPPER_HOST_ARCH} - -RUN zypper -n update && \ - zypper -n install bash git binutils glibc-devel-static gcc vim less file tar gzip curl sed wget ca-certificates - -ENV GOLANG_ARCH_amd64=amd64 GOLANG_ARCH_arm=armv6l GOLANG_ARCH_arm64=arm64 GOLANG_ARCH=GOLANG_ARCH_${ARCH} \ - GOPATH=/go CGO_ENABLED=0 PATH=/go/bin:/usr/local/go/bin:${PATH} SHELL=/bin/bash -RUN curl -sLf https://go.dev/dl/go1.21.11.linux-${ARCH}.tar.gz | tar -xzf - -C /usr/local/ -# workaround for https://bugzilla.suse.com/show_bug.cgi?id=1183043 -RUN if [ "${ARCH}" == "arm64" ]; then \ - zypper -n install binutils-gold ; \ - fi - -RUN if [ "${ARCH}" = "amd64" ]; then \ - curl -sL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.40.1; \ - fi -RUN curl -sL https://get.helm.sh/helm-v3.3.0-linux-${ARCH}.tar.gz | tar xvzf - -C /usr/local/bin --strip-components=1 - -ENV DAPPER_ENV REPO TAG DRONE_TAG CROSS -ENV DAPPER_SOURCE /go/src/github.com/rancher/gke-operator/ -ENV DAPPER_OUTPUT ./bin ./dist -ENV DAPPER_DOCKER_SOCKET true -ENV DAPPER_RUN_ARGS "-v gke-operator-pkg:/go/pkg -v gke-operator-cache:/root/.cache" -ENV HOME ${DAPPER_SOURCE} -WORKDIR ${DAPPER_SOURCE} - -ENTRYPOINT ["./scripts/entry"] -CMD ["ci"] diff --git a/Makefile b/Makefile index f3c78c7..d8a1157 100644 --- a/Makefile +++ b/Makefile @@ -51,14 +51,6 @@ endif default: operator -.dapper: - @echo Downloading dapper - @curl -sL https://releases.rancher.com/dapper/latest/dapper-`uname -s`-`uname -m` > .dapper.tmp - @@chmod +x .dapper.tmp - @./.dapper.tmp -v - @mv .dapper.tmp .dapper - - .PHONY: generate-go generate-go: $(MOCKGEN) go generate ./pkg/gke/... @@ -76,10 +68,6 @@ generate: clean: rm -rf build bin dist -.PHONY: $(TARGETS) -$(TARGETS): .dapper - ./.dapper $@ - $(MOCKGEN): GOBIN=$(BIN_DIR) $(GO_INSTALL) github.com/golang/mock/mockgen $(MOCKGEN_BIN) $(MOCKGEN_VER) diff --git a/scripts/entry b/scripts/entry deleted file mode 100755 index 78fb567..0000000 --- a/scripts/entry +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -set -e - -mkdir -p bin dist -if [ -e ./scripts/$1 ]; then - ./scripts/"$@" -else - exec "$@" -fi - -chown -R $DAPPER_UID:$DAPPER_GID .