Skip to content

Commit

Permalink
Bump K8s, client-go, CSI sidecars, Golang version
Browse files Browse the repository at this point in the history 
Longhorn-3891

Signed-off-by: Phan Le <[email protected]>
  • Loading branch information
@PhanLe1010 @innobead
PhanLe1010 authored and innobead committed May 23, 2022
1 parent 52bded8 commit fc07fe8
Show file tree
Hide file tree
Showing 2,332 changed files with 236,404 additions and 72,065 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.dapper
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ RUN if [ ${ARCH} == "s390x" ]; then \
ENV GOLANG_ARCH_amd64=amd64 GOLANG_ARCH_arm64=arm64 GOLANG_ARCH_s390x=s390x GOLANG_ARCH=GOLANG_ARCH_${ARCH} \
GOPATH=/go PATH=/go/bin:/usr/local/go/bin:${PATH} SHELL=/bin/bash

RUN wget -O - https://storage.googleapis.com/golang/go1.14.15.linux-${!GOLANG_ARCH}.tar.gz | tar -xzf - -C /usr/local && \
go get github.com/rancher/trash && go get -u golang.org/x/lint/golint
RUN wget -O - https://storage.googleapis.com/golang/go1.17.10.linux-${!GOLANG_ARCH}.tar.gz | tar -xzf - -C /usr/local && \
go get -u golang.org/x/lint/golint

ENV DAPPER_SOURCE /go/src/github.com/longhorn/longhorn-manager
ENV DAPPER_OUTPUT ./bin
Expand Down
8 changes: 0 additions & 8 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,6 @@ TARGETS := $(shell ls scripts)
$(TARGETS): .dapper
./.dapper $@

trash: .dapper
./.dapper -m bind trash

trash-keep: .dapper
./.dapper -m bind trash -k

deps: trash

.DEFAULT_GOAL := ci

.PHONY: $(TARGETS)
2 changes: 1 addition & 1 deletion controller/backing_image_data_source_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@ func (c *BackingImageDataSourceController) generateBackingImageDataSourcePodMani
ImagePullPolicy: imagePullPolicy,
Command: cmd,
ReadinessProbe: &v1.Probe{
Handler: v1.Handler{
ProbeHandler: v1.ProbeHandler{
TCPSocket: &v1.TCPSocketAction{
Port: intstr.FromInt(engineapi.BackingImageDataSourceDefaultPort),
},
Expand Down
2 changes: 1 addition & 1 deletion controller/backing_image_manager_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -805,7 +805,7 @@ func (c *BackingImageManagerController) generateBackingImageManagerPodManifest(b
"--listen", fmt.Sprintf("%s:%d", "0.0.0.0", engineapi.BackingImageManagerDefaultPort),
},
ReadinessProbe: &v1.Probe{
Handler: v1.Handler{
ProbeHandler: v1.ProbeHandler{
TCPSocket: &v1.TCPSocketAction{
Port: intstr.FromInt(engineapi.BackingImageManagerDefaultPort),
},
Expand Down
2 changes: 1 addition & 1 deletion controller/engine_image_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,7 @@ func (ic *EngineImageController) createEngineImageDaemonSetSpec(ei *longhorn.Eng
},
},
ReadinessProbe: &v1.Probe{
Handler: v1.Handler{
ProbeHandler: v1.ProbeHandler{
Exec: &v1.ExecAction{
Command: []string{
"sh", "-c",
Expand Down
2 changes: 1 addition & 1 deletion controller/instance_manager_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1047,7 +1047,7 @@ func (imc *InstanceManagerController) createGenericManagerPodSpec(im *longhorn.I
Image: im.Spec.Image,
ImagePullPolicy: imagePullPolicy,
LivenessProbe: &v1.Probe{
Handler: v1.Handler{
ProbeHandler: v1.ProbeHandler{
TCPSocket: &v1.TCPSocketAction{
Port: intstr.FromInt(engineapi.InstanceManagerDefaultPort),
},
Expand Down
2 changes: 1 addition & 1 deletion controller/share_manager_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -801,7 +801,7 @@ func (c *ShareManagerController) createPodManifest(sm *longhorn.ShareManager, an
// Command: []string{"longhorn-share-manager"},
Args: args,
ReadinessProbe: &v1.Probe{
Handler: v1.Handler{
ProbeHandler: v1.ProbeHandler{
Exec: &v1.ExecAction{
Command: []string{"cat", "/var/run/ganesha.pid"},
},
Expand Down
4 changes: 4 additions & 0 deletions csi/controller_server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -891,6 +891,10 @@ func (cs *ControllerServer) ControllerExpandVolume(ctx context.Context, req *csi
}, nil
}

func (cs *ControllerServer) ControllerGetVolume(context.Context, *csi.ControllerGetVolumeRequest) (*csi.ControllerGetVolumeResponse, error) {
return nil, status.Error(codes.Unimplemented, "")
}

// isVolumeAvailableOn checks that the volume is attached and that an engine is running on the requested node
func isVolumeAvailableOn(vol *longhornclient.Volume, node string) bool {
return vol.State == string(longhorn.VolumeStateAttached) && isEngineOnNodeAvailable(vol, node)
Expand Down
8 changes: 4 additions & 4 deletions csi/deployment.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ import (
)

const (
DefaultCSIAttacherImage = "longhornio/csi-attacher:v3.2.1"
DefaultCSIAttacherImage = "longhornio/csi-attacher:v3.4.0"
DefaultCSIProvisionerImage = "longhornio/csi-provisioner:v2.1.2"
DefaultCSIResizerImage = "longhornio/csi-resizer:v1.2.0"
DefaultCSISnapshotterImage = "longhornio/csi-snapshotter:v3.0.3"
DefaultCSINodeDriverRegistrarImage = "longhornio/csi-node-driver-registrar:v2.3.0"
DefaultCSINodeDriverRegistrarImage = "longhornio/csi-node-driver-registrar:v2.5.0"

DefaultCSIAttacherReplicaCount = 3
DefaultCSIProvisionerReplicaCount = 3
Expand Down Expand Up @@ -352,7 +352,7 @@ func NewPluginDeployment(namespace, serviceAccount, nodeDriverRegistrarImage, ma
Name: "node-driver-registrar",
Image: nodeDriverRegistrarImage,
Lifecycle: &v1.Lifecycle{
PreStop: &v1.Handler{
PreStop: &v1.LifecycleHandler{
Exec: &v1.ExecAction{
Command: []string{
"/bin/sh", "-c",
Expand Down Expand Up @@ -401,7 +401,7 @@ func NewPluginDeployment(namespace, serviceAccount, nodeDriverRegistrarImage, ma
Image: managerImage,
ImagePullPolicy: imagePullPolicy,
Lifecycle: &v1.Lifecycle{
PreStop: &v1.Handler{
PreStop: &v1.LifecycleHandler{
Exec: &v1.ExecAction{
Command: []string{
"/bin/sh", "-c",
Expand Down
4 changes: 2 additions & 2 deletions deploy/install/02-components/04-driver.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ spec:
# For AirGap Installation
# Replace PREFIX with your private registry
#- name: CSI_ATTACHER_IMAGE
# value: PREFIX/csi-attacher:v3.2.1
# value: PREFIX/csi-attacher:v3.4.0
#- name: CSI_PROVISIONER_IMAGE
# value: PREFIX/csi-provisioner:v2.1.2
#- name: CSI_NODE_DRIVER_REGISTRAR_IMAGE
# value: PREFIX/csi-node-driver-registrar:v2.3.0
# value: PREFIX/csi-node-driver-registrar:v2.5.0
#- name: CSI_RESIZER_IMAGE
# value: PREFIX/csi-resizer:v1.2.0
#- name: CSI_SNAPSHOTTER_IMAGE
Expand Down
4 changes: 2 additions & 2 deletions deploy/longhorn-images.txt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
longhornio/csi-attacher:v3.2.1
longhornio/csi-attacher:v3.4.0
longhornio/csi-provisioner:v2.1.2
longhornio/csi-resizer:v1.2.0
longhornio/csi-snapshotter:v3.0.3
longhornio/csi-node-driver-registrar:v2.3.0
longhornio/csi-node-driver-registrar:v2.5.0
longhornio/backing-image-manager:v3_20220506
longhornio/longhorn-engine:master-head
longhornio/longhorn-instance-manager:v1_20220516
Expand Down
2 changes: 1 addition & 1 deletion engineapi/backup_monitor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (

"github.com/sirupsen/logrus"

"k8s.io/apimachinery/pkg/util/clock"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/utils/clock"

longhorn "github.com/longhorn/longhorn-manager/k8s/pkg/apis/longhorn/v1beta2"
)
Expand Down
156 changes: 109 additions & 47 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,77 +1,139 @@
module github.com/longhorn/longhorn-manager

go 1.13
go 1.17

replace (
k8s.io/api => k8s.io/api v0.18.19
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.18.19
k8s.io/apimachinery => k8s.io/apimachinery v0.18.19
k8s.io/apiserver => k8s.io/apiserver v0.18.19
k8s.io/cli-runtime => k8s.io/cli-runtime v0.18.19
k8s.io/client-go => k8s.io/client-go v0.18.19
k8s.io/cloud-provider => k8s.io/cloud-provider v0.18.19
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.18.19
k8s.io/code-generator => k8s.io/code-generator v0.18.19
k8s.io/component-base => k8s.io/component-base v0.18.19
k8s.io/cri-api => k8s.io/cri-api v0.18.19
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.18.19
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.18.19
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.18.19
k8s.io/kube-proxy => k8s.io/kube-proxy v0.18.19
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.18.19
k8s.io/kubectl => k8s.io/kubectl v0.18.19
k8s.io/kubelet => k8s.io/kubelet v0.18.19
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.18.19
k8s.io/metrics => k8s.io/metrics v0.18.19
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.18.19
k8s.io/api => k8s.io/api v0.23.6
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.23.6
k8s.io/apimachinery => k8s.io/apimachinery v0.23.6
k8s.io/apiserver => k8s.io/apiserver v0.23.6
k8s.io/cli-runtime => k8s.io/cli-runtime v0.23.6
k8s.io/client-go => k8s.io/client-go v0.23.6
k8s.io/cloud-provider => k8s.io/cloud-provider v0.23.6
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.23.6
k8s.io/code-generator => k8s.io/code-generator v0.23.6
k8s.io/component-base => k8s.io/component-base v0.23.6
k8s.io/component-helpers => k8s.io/component-helpers v0.23.6
k8s.io/controller-manager => k8s.io/controller-manager v0.23.6
k8s.io/cri-api => k8s.io/cri-api v0.23.6
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.23.6
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.23.6
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.23.6
k8s.io/kube-proxy => k8s.io/kube-proxy v0.23.6
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.23.6
k8s.io/kubectl => k8s.io/kubectl v0.23.6
k8s.io/kubelet => k8s.io/kubelet v0.23.6
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.23.6
k8s.io/metrics => k8s.io/metrics v0.23.6
k8s.io/mount-utils => k8s.io/mount-utils v0.23.6
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.23.6
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.23.6
)

require (
github.com/container-storage-interface/spec v1.2.0
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect
github.com/docker/go-connections v0.3.0
github.com/golang/groupcache v0.0.0-20191002201903-404acd9df4cc // indirect
github.com/golang/protobuf v1.4.3
github.com/container-storage-interface/spec v1.5.0
github.com/docker/go-connections v0.4.0
github.com/golang/protobuf v1.5.2
github.com/google/uuid v1.3.0
github.com/gorilla/handlers v1.4.2
github.com/gorilla/mux v1.7.3
github.com/gorilla/mux v1.8.0
github.com/gorilla/websocket v1.5.0
github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.11.3 // indirect
github.com/imdario/mergo v0.3.8 // indirect
github.com/jinzhu/copier v0.3.5
github.com/kubernetes-csi/csi-lib-utils v0.6.1
github.com/longhorn/backing-image-manager v0.0.0-20220414053138-691e27b07b7e
github.com/longhorn/backupstore v0.0.0-20211109055147-56ddc538b859
github.com/longhorn/go-iscsi-helper v0.0.0-20210330030558-49a327fb024e
github.com/longhorn/longhorn-instance-manager v0.0.0-20220516140138-ca4a9ddfa51c
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.11.1
github.com/rancher/dynamiclistener v0.3.1
github.com/rancher/go-rancher v0.1.1-0.20220412083059-ff12399dd57b
github.com/rancher/lasso v0.0.0-20211217013041-3c6118a30611 // indirect
github.com/rancher/wrangler v0.8.10
github.com/robfig/cron v1.2.0
github.com/sirupsen/logrus v1.8.1
github.com/stretchr/testify v1.7.0
github.com/urfave/cli v1.22.1
github.com/urfave/cli v1.22.2
golang.org/x/mod v0.5.1
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c
golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0
google.golang.org/grpc v1.26.0
golang.org/x/net v0.0.0-20211209124913-491a49abca63
golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
google.golang.org/grpc v1.40.0
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f
gopkg.in/square/go-jose.v2 v2.3.1 // indirect
gopkg.in/yaml.v2 v2.3.0
k8s.io/api v0.18.19
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.23.6
k8s.io/apiextensions-apiserver v0.18.0
k8s.io/apimachinery v0.18.19
k8s.io/client-go v0.18.19
k8s.io/kubernetes v1.18.19
k8s.io/metrics v0.18.19
k8s.io/mount-utils v0.22.2
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a
k8s.io/apimachinery v0.23.6
k8s.io/client-go v0.23.6
k8s.io/kubernetes v1.23.6
k8s.io/metrics v0.23.6
k8s.io/mount-utils v0.23.6
k8s.io/utils v0.0.0-20211116205334-6203023598ed
sigs.k8s.io/controller-runtime v0.4.0
sigs.k8s.io/yaml v1.2.0
)

require (
github.com/Microsoft/go-winio v0.4.17 // indirect
github.com/RoaringBitmap/roaring v0.4.18 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/c9s/goprocinfo v0.0.0-20190309065803-0b2ad9ac246b // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
github.com/cyphar/filepath-securejoin v0.2.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/distribution v2.7.1+incompatible // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2 // indirect
github.com/go-logr/logr v1.2.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/snappy v0.0.1 // indirect
github.com/google/go-cmp v0.5.5 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/gorilla/context v1.1.1 // indirect
github.com/honestbee/jobq v1.0.2 // indirect
github.com/imdario/mergo v0.3.8 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/longhorn/longhorn-engine v1.3.0-preview1 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae // indirect
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/runc v1.0.2 // indirect
github.com/philhofer/fwd v1.0.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.28.0 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
github.com/rancher/lasso v0.0.0-20211217013041-3c6118a30611 // indirect
github.com/russross/blackfriday/v2 v2.0.1 // indirect
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/tinylib/msgp v1.1.1-0.20190612170807-0573788bc2a8 // indirect
github.com/willf/bitset v1.1.10 // indirect
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
golang.org/x/text v0.3.7 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2 // indirect
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
k8s.io/apiserver v0.23.6 // indirect
k8s.io/component-base v0.23.6 // indirect
k8s.io/component-helpers v0.23.6 // indirect
k8s.io/klog v1.0.0 // indirect
k8s.io/klog/v2 v2.30.0 // indirect
k8s.io/kube-aggregator v0.18.0 // indirect
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
)
Loading

0 comments on commit fc07fe8

Please sign in to comment.