Skip to content

Commit 76e798c

Browse files
tkatilatkatila
authored
Merge pull request #1310 from mythi/PR-2023-004
upgrade to k8s 1.26.1
2 parents 068c0b2 + 019c6b6 commit 76e798c

File tree

3 files changed

+62
-62
lines changed

3 files changed

+62
-62
lines changed

‎deployments/nfd/base/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
bases:
4-
- "https://github.com/kubernetes-sigs/node-feature-discovery/deployment/overlays/default?ref=v0.12.0"
4+
- "https://github.com/kubernetes-sigs/node-feature-discovery/deployment/overlays/default?ref=v0.12.1"

‎go.mod

+37-37
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ require (
1717
golang.org/x/sys v0.4.0
1818
golang.org/x/text v0.6.0
1919
google.golang.org/grpc v1.52.0
20-
k8s.io/api v0.26.0
21-
k8s.io/apimachinery v0.26.0
20+
k8s.io/api v0.26.1
21+
k8s.io/apimachinery v0.26.1
2222
k8s.io/client-go v1.5.2
23-
k8s.io/component-base v0.26.0
23+
k8s.io/component-base v0.26.1
2424
k8s.io/klog/v2 v2.80.1
25-
k8s.io/kubelet v1.26.0
26-
k8s.io/kubernetes v1.26.0
25+
k8s.io/kubelet v1.26.1
26+
k8s.io/kubernetes v1.26.1
2727
k8s.io/pod-security-admission v0.0.0
2828
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
2929
sigs.k8s.io/controller-runtime v0.14.1
@@ -90,45 +90,45 @@ require (
9090
gopkg.in/yaml.v2 v2.4.0 // indirect
9191
gopkg.in/yaml.v3 v3.0.1 // indirect
9292
k8s.io/apiextensions-apiserver v0.26.0 // indirect
93-
k8s.io/apiserver v0.26.0 // indirect
94-
k8s.io/component-helpers v0.26.0 // indirect
93+
k8s.io/apiserver v0.26.1 // indirect
94+
k8s.io/component-helpers v0.26.1 // indirect
9595
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
9696
k8s.io/kubectl v0.0.0 // indirect
97-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33 // indirect
97+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 // indirect
9898
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
9999
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
100100
)
101101

102102
replace (
103-
k8s.io/api => k8s.io/api v0.26.0
104-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.0
105-
k8s.io/apimachinery => k8s.io/apimachinery v0.26.1-rc.0
106-
k8s.io/apiserver => k8s.io/apiserver v0.26.0
107-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.0
108-
k8s.io/client-go => k8s.io/client-go v0.26.0
109-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.0
110-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.0
111-
k8s.io/code-generator => k8s.io/code-generator v0.26.1-rc.0
112-
k8s.io/component-base => k8s.io/component-base v0.26.0
113-
k8s.io/component-helpers => k8s.io/component-helpers v0.26.0
114-
k8s.io/controller-manager => k8s.io/controller-manager v0.26.0
115-
k8s.io/cri-api => k8s.io/cri-api v0.26.1-rc.0
116-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.0
117-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.26.0
118-
k8s.io/kms => k8s.io/kms v0.26.1-rc.0
119-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.0
120-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.0
121-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.0
122-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.0
123-
k8s.io/kubectl => k8s.io/kubectl v0.26.0
124-
k8s.io/kubelet => k8s.io/kubelet v0.26.0
125-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.0
126-
k8s.io/metrics => k8s.io/metrics v0.26.0
127-
k8s.io/mount-utils => k8s.io/mount-utils v0.26.1-rc.0
128-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.0
129-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.0
130-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.0
131-
k8s.io/sample-controller => k8s.io/sample-controller v0.26.0
103+
k8s.io/api => k8s.io/api v0.26.1
104+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.1
105+
k8s.io/apimachinery => k8s.io/apimachinery v0.26.2-rc.0
106+
k8s.io/apiserver => k8s.io/apiserver v0.26.1
107+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.1
108+
k8s.io/client-go => k8s.io/client-go v0.26.1
109+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.1
110+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.1
111+
k8s.io/code-generator => k8s.io/code-generator v0.26.2-rc.0
112+
k8s.io/component-base => k8s.io/component-base v0.26.1
113+
k8s.io/component-helpers => k8s.io/component-helpers v0.26.1
114+
k8s.io/controller-manager => k8s.io/controller-manager v0.26.1
115+
k8s.io/cri-api => k8s.io/cri-api v0.26.2-rc.0
116+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.1
117+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.26.1
118+
k8s.io/kms => k8s.io/kms v0.26.2-rc.0
119+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.1
120+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.1
121+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.1
122+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.1
123+
k8s.io/kubectl => k8s.io/kubectl v0.26.1
124+
k8s.io/kubelet => k8s.io/kubelet v0.26.1
125+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.1
126+
k8s.io/metrics => k8s.io/metrics v0.26.1
127+
k8s.io/mount-utils => k8s.io/mount-utils v0.26.2-rc.0
128+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.1
129+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.1
130+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.1
131+
k8s.io/sample-controller => k8s.io/sample-controller v0.26.1
132132
)
133133

134134
replace github.com/onsi/gomega v1.24.1 => github.com/onsi/gomega v1.24.0

‎go.sum

+24-24
Original file line numberDiff line numberDiff line change
@@ -592,39 +592,39 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
592592
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
593593
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
594594
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
595-
k8s.io/api v0.26.0 h1:IpPlZnxBpV1xl7TGk/X6lFtpgjgntCg8PJ+qrPHAC7I=
596-
k8s.io/api v0.26.0/go.mod h1:k6HDTaIFC8yn1i6pSClSqIwLABIcLV9l5Q4EcngKnQg=
597-
k8s.io/apiextensions-apiserver v0.26.0 h1:Gy93Xo1eg2ZIkNX/8vy5xviVSxwQulsnUdQ00nEdpDo=
598-
k8s.io/apiextensions-apiserver v0.26.0/go.mod h1:7ez0LTiyW5nq3vADtK6C3kMESxadD51Bh6uz3JOlqWQ=
599-
k8s.io/apimachinery v0.26.1-rc.0 h1:3eoGy0bC3cheClZ1RfKsZRsHdTOjAM//aqhxVlSLxKE=
600-
k8s.io/apimachinery v0.26.1-rc.0/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74=
601-
k8s.io/apiserver v0.26.0 h1:q+LqIK5EZwdznGZb8bq0+a+vCqdeEEe4Ux3zsOjbc4o=
602-
k8s.io/apiserver v0.26.0/go.mod h1:aWhlLD+mU+xRo+zhkvP/gFNbShI4wBDHS33o0+JGI84=
603-
k8s.io/client-go v0.26.0 h1:lT1D3OfO+wIi9UFolCrifbjUUgu7CpLca0AD8ghRLI8=
604-
k8s.io/client-go v0.26.0/go.mod h1:I2Sh57A79EQsDmn7F7ASpmru1cceh3ocVT9KlX2jEZg=
605-
k8s.io/component-base v0.26.0 h1:0IkChOCohtDHttmKuz+EP3j3+qKmV55rM9gIFTXA7Vs=
606-
k8s.io/component-base v0.26.0/go.mod h1:lqHwlfV1/haa14F/Z5Zizk5QmzaVf23nQzCwVOQpfC8=
607-
k8s.io/component-helpers v0.26.0 h1:KNgwqs3EUdK0HLfW4GhnbD+q/Zl9U021VfIU7qoVYFk=
608-
k8s.io/component-helpers v0.26.0/go.mod h1:jHN01qS/Jdj95WCbTe9S2VZ9yxpxXNY488WjF+yW4fo=
595+
k8s.io/api v0.26.1 h1:f+SWYiPd/GsiWwVRz+NbFyCgvv75Pk9NK6dlkZgpCRQ=
596+
k8s.io/api v0.26.1/go.mod h1:xd/GBNgR0f707+ATNyPmQ1oyKSgndzXij81FzWGsejg=
597+
k8s.io/apiextensions-apiserver v0.26.1 h1:cB8h1SRk6e/+i3NOrQgSFij1B2S0Y0wDoNl66bn8RMI=
598+
k8s.io/apiextensions-apiserver v0.26.1/go.mod h1:AptjOSXDGuE0JICx/Em15PaoO7buLwTs0dGleIHixSM=
599+
k8s.io/apimachinery v0.26.2-rc.0 h1:f9BARTuEy0MguW4KGK6VwEBT9BCe03lYde0wnWxBilk=
600+
k8s.io/apimachinery v0.26.2-rc.0/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74=
601+
k8s.io/apiserver v0.26.1 h1:6vmnAqCDO194SVCPU3MU8NcDgSqsUA62tBUSWrFXhsc=
602+
k8s.io/apiserver v0.26.1/go.mod h1:wr75z634Cv+sifswE9HlAo5FQ7UoUauIICRlOE+5dCg=
603+
k8s.io/client-go v0.26.1 h1:87CXzYJnAMGaa/IDDfRdhTzxk/wzGZ+/HUQpqgVSZXU=
604+
k8s.io/client-go v0.26.1/go.mod h1:IWNSglg+rQ3OcvDkhY6+QLeasV4OYHDjdqeWkDQZwGE=
605+
k8s.io/component-base v0.26.1 h1:4ahudpeQXHZL5kko+iDHqLj/FSGAEUnSVO0EBbgDd+4=
606+
k8s.io/component-base v0.26.1/go.mod h1:VHrLR0b58oC035w6YQiBSbtsf0ThuSwXP+p5dD/kAWU=
607+
k8s.io/component-helpers v0.26.1 h1:Y5h1OYUJTGyHZlSAsc7mcfNsWF08S/MlrQyF/vn93mU=
608+
k8s.io/component-helpers v0.26.1/go.mod h1:jxNTnHb1axLe93MyVuvKj9T/+f4nxBVrj/xf01/UNFk=
609609
k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=
610610
k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
611611
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E=
612612
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4=
613-
k8s.io/kubectl v0.26.0 h1:xmrzoKR9CyNdzxBmXV7jW9Ln8WMrwRK6hGbbf69o4T0=
614-
k8s.io/kubectl v0.26.0/go.mod h1:eInP0b+U9XUJWSYeU9XZnTA+cVYuWyl3iYPGtru0qhQ=
615-
k8s.io/kubelet v0.26.0 h1:08bDb5IoUH/1K1t2NUwnGIIWxjm9LSqn6k3FWw1tJGI=
616-
k8s.io/kubelet v0.26.0/go.mod h1:DluF+d8jS2nE/Hs7CC3QM+OZlIEb22NTOihQ3EDwCQ4=
617-
k8s.io/kubernetes v1.26.0 h1:fL8VMr4xlfTazPORLhz5fsvO5I3bsFpmynVxZTH1ItQ=
618-
k8s.io/kubernetes v1.26.0/go.mod h1:z0aCJwn6DxzB/dDiWLbQaJO5jWOR2qoaCMnmSAx45XM=
619-
k8s.io/pod-security-admission v0.26.0 h1:XBG/uyP2cYwSFr5IWAQ1IIArxMYARJKzEzSmP4ZbC1s=
620-
k8s.io/pod-security-admission v0.26.0/go.mod h1:HQHvpCrn6KQLKRUqFvWkHCVKet3X62fn2F3j5anYiEM=
613+
k8s.io/kubectl v0.26.1 h1:K8A0Jjlwg8GqrxOXxAbjY5xtmXYeYjLU96cHp2WMQ7s=
614+
k8s.io/kubectl v0.26.1/go.mod h1:miYFVzldVbdIiXMrHZYmL/EDWwJKM+F0sSsdxsATFPo=
615+
k8s.io/kubelet v0.26.1 h1:wQyCQYmLW6GN3v7gVTxnc3jAE4zMYDlzdF3FZV4rKas=
616+
k8s.io/kubelet v0.26.1/go.mod h1:gFVZ1Ab4XdjtnYdVRATwGwku7FhTxo6LVEZwYoQaDT8=
617+
k8s.io/kubernetes v1.26.1 h1:N+qxlptxpSU/VSLvqBGWyyw/kNhJRpEn1b5YP57+5rk=
618+
k8s.io/kubernetes v1.26.1/go.mod h1:dEfAfGVZBOr2uZLeVazLPj/8E+t8jYFbQqCiBudkB8o=
619+
k8s.io/pod-security-admission v0.26.1 h1:EDIxsYFeKMzNvN/JB0PgQcuwBP6fIkIG2O8ZWJhzOp4=
620+
k8s.io/pod-security-admission v0.26.1/go.mod h1:hCbYTG5UtLlivmukkMPjAWf23PUBUHzEvR60xNVWN4c=
621621
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 h1:KTgPnR10d5zhztWptI952TNtt/4u5h3IzDXkdIMuo2Y=
622622
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
623623
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
624624
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
625625
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
626-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33 h1:LYqFq+6Cj2D0gFfrJvL7iElD4ET6ir3VDdhDdTK7rgc=
627-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33/go.mod h1:soWkSNf2tZC7aMibXEqVhCd73GOY5fJikn8qbdzemB0=
626+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 h1:+xBL5uTc+BkPBwmMi3vYfUJjq+N3K+H6PXeETwf5cPI=
627+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35/go.mod h1:WxjusMwXlKzfAs4p9km6XJRndVt2FROgMVCE4cdohFo=
628628
sigs.k8s.io/controller-runtime v0.14.1 h1:vThDes9pzg0Y+UbCPY3Wj34CGIYPgdmspPm2GIpxpzM=
629629
sigs.k8s.io/controller-runtime v0.14.1/go.mod h1:GaRkrY8a7UZF0kqFFbUKG7n9ICiTY5T55P1RiE3UZlU=
630630
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=

0 commit comments

Comments
 (0)