Skip to content

Commit 87ec219

Browse files
authored
Merge pull request #905 from sbueringer/pr-finalize-inject-debian-script
Use the kubernetesversions package of the cluster-api repo again
2 parents 1ce7831 + 02a47f1 commit 87ec219

File tree

7 files changed

+10
-479
lines changed

7 files changed

+10
-479
lines changed

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ require (
1818
k8s.io/client-go v0.21.2
1919
k8s.io/component-base v0.21.2
2020
k8s.io/klog/v2 v2.9.0
21-
k8s.io/utils v0.0.0-20210527160623-6fdb442a123b
21+
k8s.io/utils v0.0.0-20210629042839-4a2b36d8d73f
2222
sigs.k8s.io/cluster-api v0.4.0
23-
sigs.k8s.io/cluster-api/test v0.4.0
24-
sigs.k8s.io/controller-runtime v0.9.1
23+
sigs.k8s.io/cluster-api/test v0.4.1-0.20210713191401-bc94459d95c6
24+
sigs.k8s.io/controller-runtime v0.9.2
2525
sigs.k8s.io/yaml v1.2.0
2626
)
2727

go.sum

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1406,8 +1406,9 @@ k8s.io/kubectl v0.21.2/go.mod h1:PgeUclpG8VVmmQIl8zpLar3IQEpFc9mrmvlwY3CK1xo=
14061406
k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
14071407
k8s.io/metrics v0.21.2/go.mod h1:wzlOINZMCtWq8dR9gHlyaOemmYlOpAoldEIXE82gAhI=
14081408
k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
1409-
k8s.io/utils v0.0.0-20210527160623-6fdb442a123b h1:MSqsVQ3pZvPGTqCjptfimO2WjG7A9un2zcpiHkA6M/s=
14101409
k8s.io/utils v0.0.0-20210527160623-6fdb442a123b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
1410+
k8s.io/utils v0.0.0-20210629042839-4a2b36d8d73f h1:6Cyc8f2OS555SrragQyv4rQ5G7F2haZ6KY2oxO1wzlE=
1411+
k8s.io/utils v0.0.0-20210629042839-4a2b36d8d73f/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
14111412
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
14121413
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
14131414
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
@@ -1416,10 +1417,11 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyz
14161417
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.19/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
14171418
sigs.k8s.io/cluster-api v0.4.0 h1:y9MxtU1uW9r9JtDyOQ/9BRXZEau2PGl2yOIozaxXO0E=
14181419
sigs.k8s.io/cluster-api v0.4.0/go.mod h1:9ALETQ/6KGZ/kYiqvQGfjOx0CfVGE39d4VP3UrS5B24=
1419-
sigs.k8s.io/cluster-api/test v0.4.0 h1:iD9WWGPQWCk85xRWNIdLYKvaZvk3wYD+rTzyqFg7yAg=
1420-
sigs.k8s.io/cluster-api/test v0.4.0/go.mod h1:Smn0J1FPtwLmd4ipXLb42RSXhKW+ur46qHWXoOAfpgw=
1421-
sigs.k8s.io/controller-runtime v0.9.1 h1:+LAqHAhkVW4lt/jLlrKmnGPA7OORMw/xEUH3Ey1h1Bs=
1420+
sigs.k8s.io/cluster-api/test v0.4.1-0.20210713191401-bc94459d95c6 h1:jM7T/F+FpjX0BCdv+tsauwuZBHk2lZ1UGSSlxfnuLkI=
1421+
sigs.k8s.io/cluster-api/test v0.4.1-0.20210713191401-bc94459d95c6/go.mod h1:7CaMJ+sHNDvFK2xWWOL2ulUTPFOoieqxhn8Nw2/2g0Y=
14221422
sigs.k8s.io/controller-runtime v0.9.1/go.mod h1:cTqsgnwSOsYS03XwySYZj8k6vf0+eC4FJRcCgQ9elb4=
1423+
sigs.k8s.io/controller-runtime v0.9.2 h1:MnCAsopQno6+hI9SgJHKddzXpmv2wtouZz6931Eax+Q=
1424+
sigs.k8s.io/controller-runtime v0.9.2/go.mod h1:TxzMCHyEUpaeuOiZx/bIdc2T81vfs/aKdvJt9wuu0zk=
14231425
sigs.k8s.io/kind v0.11.1 h1:pVzOkhUwMBrCB0Q/WllQDO3v14Y+o2V0tFgjTqIUjwA=
14241426
sigs.k8s.io/kind v0.11.1/go.mod h1:fRpgVhtqAWrtLB9ED7zQahUimpUXuG/iHT88xYqEGIA=
14251427
sigs.k8s.io/kustomize/api v0.8.8/go.mod h1:He1zoK0nk43Pc6NlV085xDXDXTNprtcyKZVm3swsdNY=

test/e2e/shared/kubernetesversions/data/debian_injection_script_control_plane.envsubst.sh

Lines changed: 0 additions & 116 deletions
This file was deleted.

test/e2e/shared/kubernetesversions/data/debian_injection_script_worker.envsubst.sh

Lines changed: 0 additions & 116 deletions
This file was deleted.

test/e2e/shared/kubernetesversions/data/kustomization.yaml

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)