Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
ialidzhikov committed Nov 24, 2023
1 parent 1da2fb1 commit 355da6a
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 20 deletions.
2 changes: 2 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -128,3 +128,5 @@ require (
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace github.com/gardener/gardener => github.com/ialidzhikov/gardener v1.64.1-0.20231124092603-280264317d0b
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,6 @@ github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4
github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
github.com/gardener/etcd-druid v0.20.1 h1:o6F4higujfg7dvBXvk+yPb86+3t2+XLE0Hmw5W1kXtM=
github.com/gardener/etcd-druid v0.20.1/go.mod h1:1tAeHycB0Vb2GfCX6sUCc6V6frGrCQI//quVg4K3GNA=
github.com/gardener/gardener v1.84.0 h1:sfW8RljFT6vaShlHV04RW/99GkTdyiwfsoUDEehVNVE=
github.com/gardener/gardener v1.84.0/go.mod h1:3XZ+Yn5iHl0acqUIVZ0K78p1OYWp52sRBQOJW6sCRR8=
github.com/gardener/hvpa-controller/api v0.5.0 h1:f4F3O7YUrenwh4S3TgPREPiB287JjjUiUL18OqPLyAA=
github.com/gardener/hvpa-controller/api v0.5.0/go.mod h1:QQl3ELkCaki+8RhXl0FZMfvnm0WCGwGJlGmrxJj6lvM=
github.com/gardener/machine-controller-manager v0.50.0 h1:3dcQjzueFU1TGgprV00adjb3OCR99myTBx8DQGxywks=
Expand Down Expand Up @@ -280,6 +278,8 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO
github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
github.com/huandu/xstrings v1.3.2 h1:L18LIDzqlW6xN2rEkpdV8+oL/IXWJ1APd+vsdYy4Wdw=
github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
github.com/ialidzhikov/gardener v1.64.1-0.20231124092603-280264317d0b h1:vi61+6nm20g432W+jExfgrYTV6zVQfcfkxwe6/rnJKY=
github.com/ialidzhikov/gardener v1.64.1-0.20231124092603-280264317d0b/go.mod h1:3XZ+Yn5iHl0acqUIVZ0K78p1OYWp52sRBQOJW6sCRR8=
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
Expand Down
20 changes: 13 additions & 7 deletions hack/check-skaffold-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,22 @@

set -e

echo "> Check Skaffold Dependencies"
operation="${1:-check}"

check_successful=true
echo "> ${operation^} Skaffold Dependencies"

success=true
repo_root="$(git rev-parse --show-toplevel)"

function check() {
if ! $repo_root/vendor/github.com/gardener/gardener/hack/check-skaffold-deps-for-binary.sh --skaffold-file $1 --binary $2 --skaffold-config $3; then
check_successful=false
function run() {
if ! "$repo_root"/vendor/github.com/gardener/gardener/hack/check-skaffold-deps-for-binary.sh "$operation" --skaffold-file "$1" --binary "$2" --skaffold-config "$3"; then
success=false
fi
}

check "skaffold.yaml" "gardener-extension-registry-cache" "extension"
check "skaffold.yaml" "gardener-extension-registry-cache-admission" "admission"
run "skaffold.yaml" "gardener-extension-registry-cache" "extension"
run "skaffold.yaml" "gardener-extension-registry-cache-admission" "admission"

if ! $success ; then
exit 1
fi
36 changes: 26 additions & 10 deletions vendor/github.com/gardener/gardener/hack/check-generate.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ github.com/fsnotify/fsnotify
# github.com/gardener/etcd-druid v0.20.1
## explicit; go 1.20
github.com/gardener/etcd-druid/api/v1alpha1
# github.com/gardener/gardener v1.84.0
# github.com/gardener/gardener v1.84.0 => github.com/ialidzhikov/gardener v1.64.1-0.20231124092603-280264317d0b
## explicit; go 1.21
github.com/gardener/gardener/.github
github.com/gardener/gardener/.github/ISSUE_TEMPLATE
Expand Down Expand Up @@ -1105,3 +1105,4 @@ sigs.k8s.io/structured-merge-diff/v4/value
# sigs.k8s.io/yaml v1.3.0
## explicit; go 1.12
sigs.k8s.io/yaml
# github.com/gardener/gardener => github.com/ialidzhikov/gardener v1.64.1-0.20231124092603-280264317d0b

0 comments on commit 355da6a

Please sign in to comment.