Skip to content

Commit 1670f88

Browse files
mrunalpagnismrunalpagnis
committed
release to open source from release 1.19
1 parent fb9348c commit 1670f88

File tree

192 files changed

+7139
-16033
lines changed

Some content is hidden

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

192 files changed

+7139
-16033
lines changed

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
ARG CI_IMAGE_REGISTRY
1616

17-
FROM ${CI_IMAGE_REGISTRY}/oci-kube-ci:1.0.4
17+
FROM ${CI_IMAGE_REGISTRY}/oci-kube-ci:1.0.5
1818

1919
ARG COMPONENT
2020

‎ci-docker-images/Dockerfile‎

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -22,50 +22,31 @@ RUN yum install oracle-softwarecollection-release-el7 -y \
2222
make \
2323
openssl \
2424
pwgen \
25-
python \
25+
python3 \
2626
wget \
2727
python-yaml \
2828
unzip && \
2929
yum clean all && rm -rf /var/cache/yum
3030

31-
RUN wget https://bootstrap.pypa.io/get-pip.py
32-
RUN python get-pip.py
31+
RUN wget https://bootstrap.pypa.io/pip/3.6/get-pip.py
32+
RUN python3 get-pip.py
3333

3434
# Install golang environment
35-
RUN curl https://storage.googleapis.com/golang/go1.12.17.linux-amd64.tar.gz -O && \
35+
RUN curl https://storage.googleapis.com/golang/go1.15.12.linux-amd64.tar.gz -O && \
3636
mkdir /tools && \
37-
tar xzf go1.12.17.linux-amd64.tar.gz -C /tools && \
38-
rm go1.12.17.linux-amd64.tar.gz && \
37+
tar xzf go1.15.12.linux-amd64.tar.gz -C /tools && \
38+
rm go1.15.12.linux-amd64.tar.gz && \
3939
mkdir -p /go/bin
4040

4141
ENV PATH=/tools/go/bin:/go/bin:/tools/linux-amd64:$PATH \
4242
GOPATH=/go \
4343
GOROOT=/tools/go
4444

4545
# Install the kubectl client
46-
RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.16.0/bin/linux/amd64/kubectl && \
46+
RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.19.0/bin/linux/amd64/kubectl && \
4747
chmod +x ./kubectl && \
4848
mv ./kubectl /usr/local/bin/kubectl
4949

50-
# Install Ginkgo
51-
RUN go get -u github.com/onsi/ginkgo/ginkgo && \
52-
go get -u github.com/onsi/gomega/...
53-
54-
# Install golint
55-
RUN go get -u golang.org/x/lint/golint
56-
57-
# Install Terraform
58-
RUN curl https://releases.hashicorp.com/terraform/0.10.7/terraform_0.10.7_linux_amd64.zip -LO && \
59-
unzip terraform_0.10.7_linux_amd64.zip && \
60-
mv terraform /usr/bin && \
61-
rm -f terraform terraform_0.10.7_linux_amd64.zip
62-
63-
# Installs the OCI terraform provider
64-
RUN curl -LO https://github.com/oracle/terraform-provider-oci/releases/download/2.0.2/linux.tar.gz && \
65-
tar -xvf linux.tar.gz -C / && \
66-
echo "providers { oci = \"/linux_amd64/terraform-provider-oci_v2.0.2\" }" > ~/.terraformrc && \
67-
rm -f linux.tar.gz
68-
6950
# Install OCI client
7051
RUN pip install \
7152
oci \

‎cmd/oci-csi-node-driver/main.go‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323

2424
"github.com/oracle/oci-cloud-controller-manager/cmd/oci-csi-node-driver/nodedriver"
2525
"github.com/oracle/oci-cloud-controller-manager/cmd/oci-csi-node-driver/nodedriveroptions"
26-
"github.com/oracle/oci-cloud-controller-manager/cmd/oci-csi-node-driver/nodedriverregistrar"
2726
"github.com/oracle/oci-cloud-controller-manager/pkg/csi/driver"
2827
"github.com/oracle/oci-cloud-controller-manager/pkg/util/signals"
2928
)
@@ -36,13 +35,8 @@ func main() {
3635
flag.StringVar(&nodecsioptions.LogLevel, "loglevel", "info", "log level")
3736
flag.StringVar(&nodecsioptions.Master, "master", "", "kube master")
3837
flag.StringVar(&nodecsioptions.Kubeconfig, "kubeconfig", "", "cluster kubeconfig")
39-
flag.DurationVar(&nodecsioptions.ConnectionTimeout, "connection-timeout", 0, "The --connection-timeout flag is deprecated")
40-
flag.StringVar(&nodecsioptions.CsiAddress, "csi-address", "/run/csi/socket", "Path of the Block Volume CSI driver socket that the node-driver-registrar will connect to.")
41-
flag.StringVar(&nodecsioptions.KubeletRegistrationPath, "kubelet-registration-path", "", "Path of the Block Volume CSI driver socket on the Kubernetes host machine.")
4238
flag.StringVar(&nodecsioptions.FssEndpoint, "fss-endpoint", "unix://tmp/fss/csi.sock", "FSS CSI endpoint")
43-
flag.StringVar(&nodecsioptions.FssCsiAddress, "fss-csi-address", "/run/fss/socket", "Path of the FSS CSI driver socket that the node-driver-registrar will connect to.")
44-
flag.StringVar(&nodecsioptions.FssKubeletRegistrationPath, "fss-kubelet-registration-path", "", "Path of the FSS CSI driver socket on the Kubernetes host machine.")
45-
flag.BoolVar(&nodecsioptions.EnableFssDriver, "fss-csi-driver-enabled", false, "Handle flag to enable FSS CSI driver")
39+
flag.BoolVar(&nodecsioptions.EnableFssDriver, "fss-csi-driver-enabled", true, "Handle flag to enable FSS CSI driver")
4640

4741
klog.InitFlags(nil)
4842
flag.Set("logtostderr", "true")

‎cmd/oci-csi-node-driver/nodedriveroptions/nodecsioptions.go‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414

1515
package nodedriveroptions
1616

17-
import (
18-
"time"
19-
)
20-
2117
//NodeCSIOptions contains details about the flag
2218
type NodeCSIOptions struct {
2319
Endpoint string // Used for Block Volume CSI driver
@@ -26,12 +22,7 @@ type NodeCSIOptions struct {
2622
Master string
2723
Kubeconfig string
2824

29-
ConnectionTimeout time.Duration
30-
CsiAddress string // Used for Block Volume CSI driver
31-
KubeletRegistrationPath string // Used for Block Volume CSI driver
3225
EnableFssDriver bool
33-
FssCsiAddress string
34-
FssKubeletRegistrationPath string
3526
FssEndpoint string
3627
}
3728

‎go.mod‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,34 +35,30 @@ require (
3535
github.com/container-storage-interface/spec v1.2.0
3636
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
3737
github.com/golang/protobuf v1.5.2
38+
github.com/hashicorp/golang-lru v0.5.4 // indirect
39+
github.com/imdario/mergo v0.3.9 // indirect
3840
github.com/kubernetes-csi/csi-lib-utils v0.8.1
39-
github.com/kubernetes-csi/external-attacher v0.0.0-20201106010650-6d1beabd0fad //v3.0.2
40-
github.com/kubernetes-csi/external-provisioner v0.0.0-20210409185916-86c2ba950e76 // v2.0.5
41-
github.com/kubernetes-csi/external-snapshotter/client/v2 v2.2.0-rc3
4241
github.com/onsi/ginkgo v1.14.1
4342
github.com/onsi/gomega v1.10.2
44-
github.com/oracle/oci-go-sdk/v31 v31.0.0-00010101000000-000000000000
43+
github.com/oracle/oci-go-sdk/v31 v31.0.0
4544
github.com/pkg/errors v0.9.1
4645
github.com/prometheus/client_golang v1.9.0
47-
github.com/spf13/cobra v1.0.0
4846
github.com/spf13/pflag v1.0.5
4947
github.com/spf13/viper v1.6.3
5048
go.uber.org/multierr v1.6.0 // indirect
5149
go.uber.org/zap v1.16.0
5250
golang.org/x/net v0.0.0-20210520170846-37e1c6afe023
53-
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40
51+
golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 // indirect
52+
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
5453
google.golang.org/grpc v1.38.0
5554
gopkg.in/natefinch/lumberjack.v2 v2.0.0
5655
gopkg.in/yaml.v2 v2.4.0
5756
k8s.io/api v0.19.12
5857
k8s.io/apimachinery v0.19.12
59-
k8s.io/apiserver v0.19.12
6058
k8s.io/client-go v0.19.12
6159
k8s.io/cloud-provider v0.19.12
6260
k8s.io/component-base v0.19.12
63-
k8s.io/csi-translation-lib v0.19.12
6461
k8s.io/klog v1.0.0
65-
k8s.io/kubelet v0.19.12
6662
k8s.io/kubernetes v1.19.12
6763
k8s.io/utils v0.0.0-20210305010621-2afb4311ab10
6864
sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.3.0

0 commit comments

Comments
 (0)