Skip to content

Commit 6baacaa

Browse files
AnkitaswAnkitasw
committed
Update CAPI to v1.2.2
1 parent b33e4f7 commit 6baacaa

File tree

8 files changed

+126
-118
lines changed

8 files changed

+126
-118
lines changed

‎go.mod

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module sigs.k8s.io/cluster-api-provider-aws
22

33
go 1.18
44

5-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.2.0
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.2.2
66

77
require (
88
github.com/alessio/shellescape v1.4.1
@@ -28,17 +28,17 @@ require (
2828
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4
2929
golang.org/x/text v0.3.7
3030
gopkg.in/yaml.v2 v2.4.0
31-
k8s.io/api v0.24.2
32-
k8s.io/apiextensions-apiserver v0.24.2
33-
k8s.io/apimachinery v0.24.2
31+
k8s.io/api v0.25.0
32+
k8s.io/apiextensions-apiserver v0.25.0
33+
k8s.io/apimachinery v0.25.0
3434
k8s.io/cli-runtime v0.24.0
35-
k8s.io/client-go v0.24.2
36-
k8s.io/component-base v0.24.2
35+
k8s.io/client-go v0.25.0
36+
k8s.io/component-base v0.25.0
3737
k8s.io/klog/v2 v2.80.0
38-
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
38+
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
3939
sigs.k8s.io/aws-iam-authenticator v0.5.9
40-
sigs.k8s.io/cluster-api v1.2.0
41-
sigs.k8s.io/cluster-api/test v1.2.0
40+
sigs.k8s.io/cluster-api v1.2.2
41+
sigs.k8s.io/cluster-api/test v1.2.2
4242
sigs.k8s.io/controller-runtime v0.12.3
4343
sigs.k8s.io/yaml v1.3.0
4444
)
@@ -53,9 +53,10 @@ require (
5353
github.com/Microsoft/go-winio v0.5.0 // indirect
5454
github.com/PuerkitoBio/purell v1.1.1 // indirect
5555
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
56-
github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210826220005-b48c857c3a0e // indirect
56+
github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220418222510-f25a4f6275ed // indirect
5757
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
5858
github.com/beorn7/perks v1.0.1 // indirect
59+
github.com/blang/semver/v4 v4.0.0 // indirect
5960
github.com/cespare/xxhash/v2 v2.1.2 // indirect
6061
github.com/coredns/caddy v1.1.0 // indirect
6162
github.com/coredns/corefile-migration v1.0.17 // indirect
@@ -68,20 +69,20 @@ require (
6869
github.com/docker/go-connections v0.4.0 // indirect
6970
github.com/docker/go-units v0.4.0 // indirect
7071
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
71-
github.com/emicklei/go-restful v2.15.0+incompatible // indirect
72+
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
7273
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
7374
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
7475
github.com/fatih/color v1.13.0 // indirect
7576
github.com/fsnotify/fsnotify v1.5.4 // indirect
76-
github.com/go-logr/zapr v1.2.0 // indirect
77+
github.com/go-logr/zapr v1.2.3 // indirect
7778
github.com/go-openapi/jsonpointer v0.19.5 // indirect
7879
github.com/go-openapi/jsonreference v0.19.5 // indirect
7980
github.com/go-openapi/swag v0.19.14 // indirect
8081
github.com/gobuffalo/flect v0.2.5 // indirect
8182
github.com/gogo/protobuf v1.3.2 // indirect
8283
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
8384
github.com/golang/protobuf v1.5.2 // indirect
84-
github.com/google/cel-go v0.10.1 // indirect
85+
github.com/google/cel-go v0.12.4 // indirect
8586
github.com/google/gnostic v0.5.7-v3refs // indirect
8687
github.com/google/go-github/v45 v45.2.0 // indirect
8788
github.com/google/go-querystring v1.1.0 // indirect
@@ -142,7 +143,7 @@ require (
142143
golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb // indirect
143144
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
144145
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
145-
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
146+
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
146147
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
147148
google.golang.org/appengine v1.6.7 // indirect
148149
google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd // indirect
@@ -152,11 +153,11 @@ require (
152153
gopkg.in/ini.v1 v1.66.4 // indirect
153154
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
154155
gopkg.in/yaml.v3 v3.0.1 // indirect
155-
k8s.io/apiserver v0.24.2 // indirect
156+
k8s.io/apiserver v0.25.0 // indirect
156157
k8s.io/cluster-bootstrap v0.24.0 // indirect
157-
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
158+
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
158159
k8s.io/kubectl v0.24.0 // indirect
159-
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
160+
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
160161
sigs.k8s.io/kind v0.14.0 // indirect
161-
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
162+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
162163
)

‎go.sum

Lines changed: 36 additions & 67 deletions
Large diffs are not rendered by default.

‎hack/tools/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20211111175208-4cc2fce2111a
1919
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211110210527-619e6b92dab9
2020
sigs.k8s.io/controller-tools v0.9.2
21-
sigs.k8s.io/kind v0.12.0
21+
sigs.k8s.io/kind v0.14.0
2222
sigs.k8s.io/kustomize/kustomize/v4 v4.5.7
2323
sigs.k8s.io/testing_frameworks v0.1.2
2424
)

‎hack/tools/go.sum

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935
5555
github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8=
5656
github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
5757
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
58-
github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
58+
github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
5959
github.com/BurntSushi/toml v1.2.0 h1:Rt8g24XnyGTyglgET/PRUNlrUeu9F5L+7FilkXfZgs0=
6060
github.com/BurntSushi/toml v1.2.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
6161
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
@@ -121,7 +121,6 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
121121
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
122122
github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
123123
github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
124-
github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM=
125124
github.com/bkielbasa/cyclop v1.2.0 h1:7Jmnh0yL2DjKfw28p86YTd/B4lRGcNuu12sKE35sM7A=
126125
github.com/bkielbasa/cyclop v1.2.0/go.mod h1:qOI0yy6A7dYC4Zgsa72Ppm9kONl0RoIlPbzot9mhmeI=
127126
github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
@@ -542,7 +541,6 @@ github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
542541
github.com/lufeee/execinquery v1.2.1 h1:hf0Ems4SHcUGBxpGN7Jz78z1ppVkP/837ZlETPCEtOM=
543542
github.com/lufeee/execinquery v1.2.1/go.mod h1:EC7DrEKView09ocscGHC+apXMIaorh4xqSxS/dy8SbM=
544543
github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
545-
github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
546544
github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo=
547545
github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
548546
github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
@@ -647,7 +645,6 @@ github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT9
647645
github.com/otiai10/mint v1.3.1/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc=
648646
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
649647
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
650-
github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
651648
github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
652649
github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
653650
github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
@@ -768,11 +765,9 @@ github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z
768765
github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo=
769766
github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo=
770767
github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
771-
github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
772768
github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
773769
github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU=
774770
github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo=
775-
github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk=
776771
github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g=
777772
github.com/spf13/cobra v1.5.0 h1:X+jTBEBqF0bHN+9cSMgmfuvv2VHJ9ezmFNf9Y/XstYU=
778773
github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM=
@@ -783,7 +778,6 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn
783778
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
784779
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
785780
github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
786-
github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns=
787781
github.com/spf13/viper v1.12.0 h1:CZ7eSOd3kZoaYDLbXnmzgQI5RlciuXBMA+18HwHRfZQ=
788782
github.com/spf13/viper v1.12.0/go.mod h1:b6COn30jlNxbm/V2IqWiNWkJ+vZNiMNksliPCiuKtSI=
789783
github.com/ssgreg/nlreturn/v2 v2.2.1 h1:X4XDI7jstt3ySqGU86YGAURbxw3oTDPK9sPEi6YEwQ0=
@@ -1026,7 +1020,6 @@ golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ
10261020
golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
10271021
golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
10281022
golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
1029-
golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
10301023
golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
10311024
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
10321025
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -1260,7 +1253,6 @@ google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34q
12601253
google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
12611254
google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU=
12621255
google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94=
1263-
google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8=
12641256
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
12651257
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
12661258
google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -1365,7 +1357,6 @@ gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMy
13651357
gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
13661358
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
13671359
gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
1368-
gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
13691360
gopkg.in/ini.v1 v1.66.6 h1:LATuAqN/shcYAOkv3wl2L4rkaKqkcgTBQjOyYDvcPKI=
13701361
gopkg.in/ini.v1 v1.66.6/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
13711362
gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
@@ -1450,8 +1441,8 @@ sigs.k8s.io/controller-tools v0.9.2 h1:AkTE3QAdz9LS4iD3EJvHyYxBkg/g9fTbgiYsrcsFC
14501441
sigs.k8s.io/controller-tools v0.9.2/go.mod h1:NUkn8FTV3Sad3wWpSK7dt/145qfuQ8CKJV6j4jHC5rM=
14511442
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 h1:kDi4JBNAsJWfz1aEXhO8Jg87JJaPNLh5tIzYHgStQ9Y=
14521443
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY=
1453-
sigs.k8s.io/kind v0.12.0 h1:LFynXwQkH1MrWI8pM1FQty0oUwEKjU5EkMaVZaPld8E=
1454-
sigs.k8s.io/kind v0.12.0/go.mod h1:EcgDSBVxz8Bvm19fx8xkioFrf9dC30fMJdOTXBSGNoM=
1444+
sigs.k8s.io/kind v0.14.0 h1:cNmI3jGBvp7UegEGbC5we8plDtCUmaNRL+bod7JoSCE=
1445+
sigs.k8s.io/kind v0.14.0/go.mod h1:UrFRPHG+2a5j0Q7qiR4gtJ4rEyn8TuMQwuOPf+m4oHg=
14551446
sigs.k8s.io/kubebuilder/docs/book/utils v0.0.0-20211028165026-57688c578b5d h1:KLiQzLW3RZJR19+j4pw2h5iioyAyqCkDBEAFdnGa3N8=
14561447
sigs.k8s.io/kubebuilder/docs/book/utils v0.0.0-20211028165026-57688c578b5d/go.mod h1:NRdZafr4zSCseLQggdvIMXa7umxf+Q+PJzrj3wFwiGE=
14571448
sigs.k8s.io/kustomize/api v0.12.1 h1:7YM7gW3kYBwtKvoY216ZzY+8hM+lV53LUayghNRJ0vM=

‎main.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import (
3333
"k8s.io/client-go/tools/leaderelection/resourcelock"
3434
cgrecord "k8s.io/client-go/tools/record"
3535
"k8s.io/component-base/logs"
36+
logsv1 "k8s.io/component-base/logs/api/v1"
3637
_ "k8s.io/component-base/logs/json/register"
3738
"k8s.io/klog/v2"
3839
ctrl "sigs.k8s.io/controller-runtime"
@@ -114,7 +115,7 @@ func main() {
114115
pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
115116
pflag.Parse()
116117

117-
if err := logOptions.ValidateAndApply(nil); err != nil {
118+
if err := logsv1.ValidateAndApply(logOptions, nil); err != nil {
118119
setupLog.Error(err, "unable to validate and apply log options")
119120
os.Exit(1)
120121
}
@@ -485,7 +486,7 @@ func initFlags(fs *pflag.FlagSet) {
485486
)
486487

487488
logs.AddFlags(fs, logs.SkipLoggingConfigurationFlags())
488-
logOptions.AddFlags(fs)
489+
logsv1.AddFlags(logOptions, fs)
489490

490491
feature.MutableGates.AddFlag(fs)
491492
}

‎test/e2e/data/e2e_conf.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,19 @@ images:
2727
loadBehavior: tryLoad
2828
- name: quay.io/jetstack/cert-manager-controller:v1.7.2
2929
loadBehavior: tryLoad
30-
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.2.0
30+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.2.2
3131
loadBehavior: tryLoad
32-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.2.0
32+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.2.2
3333
loadBehavior: tryLoad
34-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.2.0
34+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.2.2
3535
loadBehavior: tryLoad
3636

3737
providers:
3838
- name: cluster-api
3939
type: CoreProvider
4040
versions:
41-
- name: v1.2.0 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
42-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.0/core-components.yaml"
41+
- name: v1.2.2 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
42+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.2/core-components.yaml"
4343
type: "url"
4444
contract: v1beta1
4545
files:
@@ -54,8 +54,8 @@ providers:
5454
files:
5555
- sourcePath: "./shared/v1beta1/metadata.yaml"
5656
versions:
57-
- name: v1.2.0 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
58-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.0/bootstrap-components.yaml"
57+
- name: v1.2.2 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
58+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.2/bootstrap-components.yaml"
5959
type: "url"
6060
contract: v1beta1
6161
files:
@@ -70,8 +70,8 @@ providers:
7070
files:
7171
- sourcePath: "./shared/v1beta1/metadata.yaml"
7272
versions:
73-
- name: v1.2.0 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
74-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.0/control-plane-components.yaml"
73+
- name: v1.2.2 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
74+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.2/control-plane-components.yaml"
7575
type: "url"
7676
contract: v1beta1
7777
files:

‎test/e2e/data/e2e_eks_conf.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@ images:
2323
loadBehavior: tryLoad
2424
- name: quay.io/jetstack/cert-manager-controller:v1.7.2
2525
loadBehavior: tryLoad
26-
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.2.0
26+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.2.2
2727
loadBehavior: tryLoad
28-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.2.0
28+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.2.2
2929
loadBehavior: tryLoad
30-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.2.0
30+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.2.2
3131
loadBehavior: tryLoad
3232

3333
providers:
3434
- name: cluster-api
3535
type: CoreProvider
3636
versions:
37-
- name: v1.2.0
38-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.0/core-components.yaml"
37+
- name: v1.2.2
38+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.2/core-components.yaml"
3939
type: "url"
4040
contract: v1beta1
4141
files:
@@ -50,8 +50,8 @@ providers:
5050
files:
5151
- sourcePath: "./shared/v1beta1/metadata.yaml"
5252
versions:
53-
- name: v1.2.0
54-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.0/bootstrap-components.yaml"
53+
- name: v1.2.2
54+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.2/bootstrap-components.yaml"
5555
type: "url"
5656
contract: v1beta1
5757
files:
@@ -66,8 +66,8 @@ providers:
6666
files:
6767
- sourcePath: "./shared/v1beta1/metadata.yaml"
6868
versions:
69-
- name: v1.2.0
70-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.0/control-plane-components.yaml"
69+
- name: v1.2.2
70+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.2/control-plane-components.yaml"
7171
type: "url"
7272
contract: v1beta1
7373
files:

0 commit comments

Comments
 (0)