-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into dependabot/go_modules/k8s.io/client-go-0.32.0
Signed-off-by: Jay Jijie Chen <[email protected]>
- Loading branch information
Showing
9 changed files
with
98 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| TOP = $(shell pwd) | ||
|
|
||
| include mk/deps.mk | ||
| include mk/dev.mk | ||
| include mk/check.mk | ||
| include mk/build.mk | ||
| include mk/run.mk |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| 96998f5a97c44fe0581a13e72806ebad04bde997 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| set -e | ||
|
|
||
| OUTPUT_DIR=$1/bin | ||
| VERSION="0.24.0" | ||
| KIND=${OUTPUT_DIR}/kind | ||
| if [ -e "$KIND" ] && [ "v$($KIND --version | cut -d ' ' -f3)" == v${VERSION} ]; then | ||
| echo "$($KIND --version ) is already installed at ${OUTPUT_DIR}" ; | ||
| exit | ||
| fi | ||
| echo "Installing kind ${VERSION} ..." | ||
| set -x | ||
| # see https://kind.sigs.k8s.io/docs/user/quick-start/#installation | ||
| curl --location --fail -s -o "${KIND}" https://github.com/kubernetes-sigs/kind/releases/download/v${VERSION}/kind-"${OS}"-"${ARCH}" | ||
| chmod +x "${KIND}" | ||
| set +x | ||
| echo "Kind $VERSION has been installed at $OUTPUT_DIR" |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| SMOKE_PRODUCT_NAME ?= kuma | ||
| SMOKE_PRODUCT_VERSION ?= 2.9.2 | ||
| CI_TOOLS_DIR ?= ${HOME}/.kuma-smoke-dev | ||
| CI_TOOLS_BIN_DIR=$(CI_TOOLS_DIR)/bin | ||
|
|
||
| export PATH := $(CI_TOOLS_BIN_DIR):$(PATH) | ||
|
|
||
| TOOLS_DIR = $(TOP)/tools | ||
| TOOLS_DEPS_DIRS=$(TOP)/mk/dependencies | ||
| TOOLS_DEPS_LOCK_FILE=mk/dependencies/deps.lock | ||
| TOOLS_MAKEFILE=$(TOP)/mk/dev.mk | ||
| GOOS := $(shell go env GOOS) | ||
| GOARCH := $(shell go env GOARCH) | ||
|
|
||
| GINKGO=$(CI_TOOLS_BIN_DIR)/ginkgo | ||
|
|
||
| .PHONY: dev/go | ||
| dev/go: | ||
| GOBIN=${CI_TOOLS_BIN_DIR} go install github.com/onsi/ginkgo/v2/ginkgo@$$(go list -f '{{.Version}}' -m github.com/onsi/ginkgo/v2) | ||
| GOBIN=${CI_TOOLS_BIN_DIR} go install github.com/mikefarah/yq/[email protected] | ||
|
|
||
| .PHONY: dev/tools | ||
| dev/tools: dev/go | ||
| $(TOOLS_DIR)/dev/install-dev-tools.sh $(CI_TOOLS_BIN_DIR) $(CI_TOOLS_DIR) "$(TOOLS_DEPS_DIRS)" $(TOOLS_DEPS_LOCK_FILE) $(GOOS) $(GOARCH) $(TOOLS_MAKEFILE) | ||
|
|
||
|
|
||
| .PHONY: kind | ||
| kind: | ||
| echo $(PATH) | ||
| kind get clusters |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| #!/bin/bash | ||
|
|
||
| set -e | ||
|
|
||
| CI_TOOLS_BIN_DIR="$1" | ||
| CI_TOOLS_DIR="$2" | ||
| TOOLS_DEPS_DIRS="$3" | ||
| TOOLS_DEPS_LOCK_FILE="$4" | ||
| GOOS="$5" | ||
| GOARCH="$6" | ||
| TOOLS_MAKEFILE="$7" | ||
|
|
||
| mkdir -p "$CI_TOOLS_BIN_DIR" "$CI_TOOLS_DIR"/protos | ||
| # TOOLS_DEPS_DIRS has space separated directories | ||
| IFS=" " read -ra TOOLS_DEPS_DIRS <<< "${TOOLS_DEPS_DIRS[@]}" | ||
|
|
||
| # Also compute a hash to use for caching | ||
| FILES=$(find "${TOOLS_DEPS_DIRS[@]}" -name '*.sh' | sort) | ||
| for i in ${FILES}; do | ||
| OS="$GOOS" ARCH="$GOARCH" "$i" "${CI_TOOLS_DIR}" & | ||
| done | ||
|
|
||
| wait | ||
| # use dev.mk to calculate the hash | ||
| FILES+=" "${TOOLS_MAKEFILE} | ||
| for i in ${FILES}; do cat "${i}"; done | git hash-object --stdin > "$TOOLS_DEPS_LOCK_FILE" | ||
|
|
||
| echo "All non code dependencies installed, if you use these tools outside of make add $CI_TOOLS_BIN_DIR to your PATH" |