Skip to content

Commit 80a8973

Browse files
humblechumblec
committed
Update kube vendor dependency and others to latest version
Signed-off-by: Humble Chirammal <[email protected]>
1 parent 199a1b8 commit 80a8973

File tree

597 files changed

+19201
-10706
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

597 files changed

+19201
-10706
lines changed

‎go.mod

+26-26
Original file line numberDiff line numberDiff line change
@@ -4,54 +4,54 @@ go 1.12
44

55
require (
66
github.com/container-storage-interface/spec v1.2.0
7-
github.com/imdario/mergo v0.3.7 // indirect
7+
github.com/imdario/mergo v0.3.9 // indirect
88
github.com/kubernetes-csi/csi-lib-utils v0.7.0
9-
google.golang.org/grpc v1.26.0
10-
k8s.io/api v0.17.0
11-
k8s.io/apimachinery v0.17.1-beta.0
12-
k8s.io/client-go v0.17.0
13-
k8s.io/csi-translation-lib v0.17.0
9+
google.golang.org/grpc v1.28.0
10+
k8s.io/api v0.18.0
11+
k8s.io/apimachinery v0.18.0
12+
k8s.io/client-go v0.18.0
13+
k8s.io/csi-translation-lib v0.18.0
1414
k8s.io/klog v1.0.0
1515
)
1616

17-
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.17.0
17+
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.18.0
1818

19-
replace k8s.io/apiserver => k8s.io/apiserver v0.17.0
19+
replace k8s.io/apiserver => k8s.io/apiserver v0.18.0
2020

21-
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.17.0
21+
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.18.0
2222

23-
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.17.0
23+
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.18.0
2424

25-
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.17.0
25+
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.18.0
2626

27-
replace k8s.io/code-generator => k8s.io/code-generator v0.17.1-beta.0
27+
replace k8s.io/code-generator => k8s.io/code-generator v0.18.0
2828

29-
replace k8s.io/component-base => k8s.io/component-base v0.17.0
29+
replace k8s.io/component-base => k8s.io/component-base v0.18.0
3030

31-
replace k8s.io/cri-api => k8s.io/cri-api v0.17.1-beta.0
31+
replace k8s.io/cri-api => k8s.io/cri-api v0.18.0
3232

33-
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.17.0
33+
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.18.0
3434

35-
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.17.0
35+
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.18.0
3636

37-
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.17.0
37+
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.18.0
3838

39-
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.17.0
39+
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.18.0
4040

41-
replace k8s.io/kubectl => k8s.io/kubectl v0.17.0
41+
replace k8s.io/kubectl => k8s.io/kubectl v0.18.0
4242

43-
replace k8s.io/kubelet => k8s.io/kubelet v0.17.0
43+
replace k8s.io/kubelet => k8s.io/kubelet v0.18.0
4444

45-
replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.17.0
45+
replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.18.0
4646

47-
replace k8s.io/metrics => k8s.io/metrics v0.17.0
47+
replace k8s.io/metrics => k8s.io/metrics v0.18.0
4848

49-
replace k8s.io/node-api => k8s.io/node-api v0.17.0
49+
replace k8s.io/node-api => k8s.io/node-api v0.18.0
5050

51-
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.17.0
51+
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.18.0
5252

53-
replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.17.0
53+
replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.18.0
5454

55-
replace k8s.io/sample-controller => k8s.io/sample-controller v0.17.0
55+
replace k8s.io/sample-controller => k8s.io/sample-controller v0.18.0
5656

5757
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20190918203248-97c07dcbb623

‎go.sum

+45-6
Large diffs are not rendered by default.

‎pkg/resizer/csi_resizer.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,11 @@ import (
2626
"github.com/kubernetes-csi/csi-lib-utils/metrics"
2727
"github.com/kubernetes-csi/external-resizer/pkg/csi"
2828
"github.com/kubernetes-csi/external-resizer/pkg/util"
29-
3029
v1 "k8s.io/api/core/v1"
3130
"k8s.io/apimachinery/pkg/api/resource"
3231
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3332
"k8s.io/client-go/informers"
3433
"k8s.io/client-go/kubernetes"
35-
3634
csitranslationlib "k8s.io/csi-translation-lib"
3735
"k8s.io/klog"
3836
)
@@ -300,7 +298,7 @@ func getCredentials(k8sClient kubernetes.Interface, ref *v1.SecretReference) (ma
300298
return nil, nil
301299
}
302300

303-
secret, err := k8sClient.CoreV1().Secrets(ref.Namespace).Get(ref.Name, metav1.GetOptions{})
301+
secret, err := k8sClient.CoreV1().Secrets(ref.Namespace).Get(ctx, ref.Name, metav1.GetOptions{})
304302
if err != nil {
305303
return nil, fmt.Errorf("error getting secret %s in namespace %s: %v", ref.Name, ref.Namespace, err)
306304
}

‎pkg/resizer/resizer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package resizer
1818

1919
import (
20-
"k8s.io/api/core/v1"
20+
v1 "k8s.io/api/core/v1"
2121
"k8s.io/apimachinery/pkg/api/resource"
2222
)
2323

‎pkg/util/util.go

+7-3
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,15 @@ limitations under the License.
1717
package util
1818

1919
import (
20+
"context"
2021
"encoding/json"
2122
"fmt"
2223
"regexp"
2324

24-
"k8s.io/api/core/v1"
25+
v1 "k8s.io/api/core/v1"
2526
"k8s.io/apimachinery/pkg/api/meta"
2627
"k8s.io/apimachinery/pkg/api/resource"
28+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2729
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
2830
"k8s.io/apimachinery/pkg/types"
2931
"k8s.io/apimachinery/pkg/util/strategicpatch"
@@ -37,6 +39,8 @@ var knownResizeConditions = map[v1.PersistentVolumeClaimConditionType]bool{
3739
v1.PersistentVolumeClaimFileSystemResizePending: true,
3840
}
3941

42+
var ctx context.Context = context.Background()
43+
4044
// NewK8sClient is an utility function used to create a kubernetes sdk client.
4145
func NewK8sClient(master, kubeConfig string) (kubernetes.Interface, error) {
4246
var config *rest.Config
@@ -103,7 +107,7 @@ func PatchPVCStatus(
103107
return nil, fmt.Errorf("can't patch status of PVC %s as generate path data failed: %v", PVCKey(oldPVC), err)
104108
}
105109
updatedClaim, updateErr := kubeClient.CoreV1().PersistentVolumeClaims(oldPVC.Namespace).
106-
Patch(oldPVC.Name, types.StrategicMergePatchType, patchBytes, "status")
110+
Patch(ctx, oldPVC.Name, types.StrategicMergePatchType, patchBytes, metav1.PatchOptions{}, "status")
107111
if updateErr != nil {
108112
return nil, fmt.Errorf("can't patch status of PVC %s with %v", PVCKey(oldPVC), updateErr)
109113
}
@@ -150,7 +154,7 @@ func UpdatePVCapacity(pv *v1.PersistentVolume, newCapacity resource.Quantity, ku
150154
if err != nil {
151155
return fmt.Errorf("can't update capacity of PV %s as generate path data failed: %v", pv.Name, err)
152156
}
153-
_, updateErr := kubeClient.CoreV1().PersistentVolumes().Patch(pv.Name, types.StrategicMergePatchType, patchBytes)
157+
_, updateErr := kubeClient.CoreV1().PersistentVolumes().Patch(ctx, pv.Name, types.StrategicMergePatchType, patchBytes, metav1.PatchOptions{})
154158
if updateErr != nil {
155159
return fmt.Errorf("update capacity of PV %s failed: %v", pv.Name, updateErr)
156160
}

‎vendor/github.com/gogo/protobuf/proto/encode.go

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/gogo/protobuf/proto/lib.go

+13-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/gogo/protobuf/proto/properties.go

+41-30
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/gogo/protobuf/proto/table_marshal.go

+10-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/gogo/protobuf/proto/table_merge.go

+19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)