Skip to content

Commit 76c709c

Browse files
authored
Use Kubernetes v1.21.0 toolchain (#111)
Signed-off-by: 1gtm <1gtm@appscode.com>
1 parent f23be1a commit 76c709c

File tree

13 files changed

+960
-654
lines changed

13 files changed

+960
-654
lines changed

go.mod

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@ require (
1414
k8s.io/client-go v12.0.0+incompatible
1515
k8s.io/component-base v0.21.0
1616
k8s.io/kubectl v0.21.0
17-
kmodules.xyz/client-go v0.0.0-20210502215034-b73197efff3f
18-
kmodules.xyz/custom-resources v0.0.0-20210502220303-115fa584b8d1
17+
kmodules.xyz/client-go v0.0.0-20210503064222-c8c59295a3a5
18+
kmodules.xyz/custom-resources v0.0.0-20210503065135-5267be335cb4
19+
kmodules.xyz/monitoring-agent-api v0.0.0-20210503064631-e2d5686a9acd // indirect
20+
kmodules.xyz/offshoot-api v0.0.0-20210503065102-3250bbdedc8f // indirect
1921
kubevault.dev/apimachinery v0.0.0-20210124211354-5738aa125d4d
2022
)
2123

go.sum

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1470,18 +1470,20 @@ k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g
14701470
k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
14711471
kmodules.xyz/client-go v0.0.0-20201105071625-0b277310b9b8/go.mod h1:WXDwZBmvrcLgGcuO9iZpI9jcfPuDFfWbxA4EnhAFtGw=
14721472
kmodules.xyz/client-go v0.0.0-20210118094617-273ba20ad7ca/go.mod h1:GdX1CHOpjL4F8P9O/7dE9m0fIOs05BNHKVT+kM51rk8=
1473-
kmodules.xyz/client-go v0.0.0-20210429233600-944c5ec810d6/go.mod h1:VZQrfOxE9CIF1d5nco5LTeZ5or6TJeaUMqRjVW4pYB4=
1474-
kmodules.xyz/client-go v0.0.0-20210502215034-b73197efff3f h1:a0ClahgI4hrGg2VM+brfmPKjx52s8aDMHyB1b8xXpxY=
14751473
kmodules.xyz/client-go v0.0.0-20210502215034-b73197efff3f/go.mod h1:lHHgEovuSVHCDl7pe0ZyY4VrVTtByfijZpKeLk5A1/M=
1474+
kmodules.xyz/client-go v0.0.0-20210503064222-c8c59295a3a5 h1:4EyHIidgWmKsej6QLyHOhZXelzWB/FcEx/E+SQz9Tl0=
1475+
kmodules.xyz/client-go v0.0.0-20210503064222-c8c59295a3a5/go.mod h1:Dg0/zImljlRXce1Nr/nr0xv2bOIVTFqRJr+AvFoYXJU=
14761476
kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4/go.mod h1:WrO3fryNyFCgqqyWnwI89lnzWA7kN072Ehya7ELGfzE=
1477-
kmodules.xyz/crd-schema-fuzz v0.0.0-20210427142518-307383b79acb/go.mod h1:UR/KjeT4CryN82am49WNwsa/WTQe4eCx0Z9dIze1sXI=
1477+
kmodules.xyz/crd-schema-fuzz v0.0.0-20210503010137-7a9466ed654d/go.mod h1:+0EBYebOhhZ4+yhaUhmLHgO824kSXlSo3NhVPNHR8uk=
14781478
kmodules.xyz/custom-resources v0.0.0-20201124062543-bd8d35c21b0c/go.mod h1:/r3/eJ3LIfwGyBEVaobqUZRZGh7GJv5RJojj/bdD14Q=
1479-
kmodules.xyz/custom-resources v0.0.0-20210502220303-115fa584b8d1 h1:pYyOznZwcuj/f+NBn6qqacZppkCfYf8IV6SgIj+gWBo=
1480-
kmodules.xyz/custom-resources v0.0.0-20210502220303-115fa584b8d1/go.mod h1:Hj1c6EkMD8FdSMQ1XVpZfV3MgEMU1/gKv6mwCRt1PD8=
1481-
kmodules.xyz/monitoring-agent-api v0.0.0-20201105074044-be7a1044891a h1:3uwHtoj4msqYEoAJ7lyS7z3OFeQPF9v3J4Iv8shs86U=
1479+
kmodules.xyz/custom-resources v0.0.0-20210503065135-5267be335cb4 h1:mKt1c3QZpnH/XPB70T8eK078qOwEH/3eppaZSI5S0yo=
1480+
kmodules.xyz/custom-resources v0.0.0-20210503065135-5267be335cb4/go.mod h1:MKt1Z0Wf2YFlQC/W8b+jMAuVZ6KnAwEVTwUN0I8jSK8=
14821481
kmodules.xyz/monitoring-agent-api v0.0.0-20201105074044-be7a1044891a/go.mod h1:r8b8lckYt5Gc5tiF3NSBPJmUrxPILerNRdozcaX7grI=
1483-
kmodules.xyz/offshoot-api v0.0.0-20201105074700-8675f5f686f2 h1:JVuNeHhVq/iRRM2yRF7nuYUdq1necfAPGpA5JjUcBuk=
1482+
kmodules.xyz/monitoring-agent-api v0.0.0-20210503064631-e2d5686a9acd h1:7XbVEg/MATceE59+43pdAp5jFLUEVm1/Ytldp7ZmXNQ=
1483+
kmodules.xyz/monitoring-agent-api v0.0.0-20210503064631-e2d5686a9acd/go.mod h1:i2HzOwHxete/IdN8evVOWC59Pr2vdNWf228RLjDB8zo=
14841484
kmodules.xyz/offshoot-api v0.0.0-20201105074700-8675f5f686f2/go.mod h1:RMHLigHILAk04wMAuMqBerskKdWlLyjqb0zLLL68cBM=
1485+
kmodules.xyz/offshoot-api v0.0.0-20210503065102-3250bbdedc8f h1:YZObnJn+OSkb21hwZRlgbHDlFFONOUZwIPx4ZV7lQ0o=
1486+
kmodules.xyz/offshoot-api v0.0.0-20210503065102-3250bbdedc8f/go.mod h1:Hzs9wg/EJIA7hI6PdSBry46Sf7JwMDXvSeTzM17TSqo=
14851487
kubevault.dev/apimachinery v0.0.0-20210124211354-5738aa125d4d h1:Pa9GbhqoNusG/HSzZO61AQ/M9aTga/kStLtMwghBGRQ=
14861488
kubevault.dev/apimachinery v0.0.0-20210124211354-5738aa125d4d/go.mod h1:Zdh3N46t4Hb77jK6rtLMYLkcvCfq5XLOAYxt0yMnTh8=
14871489
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=

vendor/kmodules.xyz/client-go/go.mod

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,10 @@ replace github.com/Azure/go-autorest/logger => github.com/Azure/go-autorest/logg
8080

8181
replace github.com/Azure/go-autorest/tracing => github.com/Azure/go-autorest/tracing v0.6.0
8282

83+
replace github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d
84+
85+
replace github.com/docker/docker => github.com/moby/moby v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible
86+
8387
replace github.com/go-openapi/analysis => github.com/go-openapi/analysis v0.19.5
8488

8589
replace github.com/go-openapi/errors => github.com/go-openapi/errors v0.19.2
@@ -124,7 +128,7 @@ replace google.golang.org/genproto => google.golang.org/genproto v0.0.0-20201110
124128

125129
replace google.golang.org/grpc => google.golang.org/grpc v1.27.1
126130

127-
replace helm.sh/helm/v3 => github.com/kubepack/helm/v3 v3.1.0-rc.1.0.20210427034123-21364f60dbb1
131+
replace helm.sh/helm/v3 => github.com/kubepack/helm/v3 v3.1.0-rc.1.0.20210503022716-7e2d4913a125
128132

129133
replace k8s.io/api => k8s.io/api v0.21.0
130134

@@ -138,7 +142,7 @@ replace k8s.io/client-go => k8s.io/client-go v0.21.0
138142

139143
replace k8s.io/component-base => k8s.io/component-base v0.21.0
140144

141-
replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd
145+
replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7
142146

143147
replace k8s.io/kubernetes => github.com/kmodules/kubernetes v1.22.0-alpha.0.0.20210427080452-22d2e66bae50
144148

vendor/kmodules.xyz/client-go/go.sum

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWo
130130
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
131131
github.com/gabriel-vasile/mimetype v1.2.0 h1:A6z5J8OhjiWFV91sQ3dMI8apYu/tvP9keDaMM3Xu6p4=
132132
github.com/gabriel-vasile/mimetype v1.2.0/go.mod h1:6CDPel/o/3/s4+bp6kIbsWATq8pmgOisOPG40CJa6To=
133-
github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
134133
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
135134
github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
136135
github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
@@ -730,8 +729,8 @@ k8s.io/klog/v2 v2.8.0 h1:Q3gmuM9hKEjefWFFYF0Mat+YyFJvsUyYuwyNNJ5C9Ts=
730729
k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
731730
k8s.io/kube-aggregator v0.21.0 h1:my2WYu8RJcj/ZzWAjPPnmxNRELk/iCdPjMaOmsZOeBU=
732731
k8s.io/kube-aggregator v0.21.0/go.mod h1:sIaa9L4QCBo9gjPyoGJns4cBjYVLq3s49FxF7m/1A0A=
733-
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd h1:sOHNzJIkytDF6qadMNKhhDRpc6ODik8lVC6nOur7B2c=
734-
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM=
732+
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 h1:vEx13qjvaZ4yfObSSXW7BrMc/KQBBT/Jyee8XtLf4x0=
733+
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE=
735734
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw=
736735
k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
737736
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=

vendor/kmodules.xyz/monitoring-agent-api/api/v1/generated.pb.go

Lines changed: 5 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/kmodules.xyz/monitoring-agent-api/api/v1/generated.proto

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/kmodules.xyz/monitoring-agent-api/api/v1/openapi_generated.go

Lines changed: 11 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)