Skip to content

Commit 220ab89

Browse files
ankitkumr10mrunalpagnisrohitChaware
authored
Release 0.10.0 (#333)
Improve unit test coverage. service annotation oci-load-balancer-internal: false is not honored CSI - Wait for volume to reach DETACHED state before attempting to attach Add unit tests for CSI Pin the version of iscsi in node driver If the version of iscsid is not compatible between worker nodes and on csi node pods the connection to volume fails. Fix Backup Restore E2E test for multi Attach Error Drop iSCSI package installation and add util-linux to the cloud-provider-oci image Co-Authored-By: Rohit Chaware <[email protected]> Co-Authored-By: Ankit Kumar <[email protected]> Co-authored-by: mpagnis <[email protected]> Co-authored-by: Rohit Chaware <[email protected]>
1 parent c4096d1 commit 220ab89

21 files changed

+1653
-87
lines changed

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ FROM oraclelinux:7-slim
3232
COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/dist/* /usr/local/bin/
3333
COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/image/* /usr/local/bin/
3434

35-
RUN yum install -y iscsi-initiator-utils-6.2.0.874-10.0.5.el7 \
36-
&& yum install -y e2fsprogs \
37-
&& yum clean all
35+
RUN yum install -y util-linux \
36+
&& yum install -y e2fsprogs \
37+
&& yum clean all

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ else
2727
OSS_REGISTRY ?= ${OSS_REGISTRY}
2828
endif
2929
IMAGE ?= $(OSS_REGISTRY)/cloud-provider-oci
30-
COMPONENT ?= oci-cloud-controller-manager oci-volume-provisioner oci-flexvolume-driver cloud-provider-oci oci-csi-controller-driver oci-csi-node-driver
30+
COMPONENT ?= oci-cloud-controller-manager oci-volume-provisioner oci-flexvolume-driver oci-csi-controller-driver oci-csi-node-driver
3131

3232
ifeq "$(VERSION)" ""
3333
BUILD := $(shell git describe --exact-match 2> /dev/null || git describe --match=$(git rev-parse --short=8 HEAD) --always --dirty --abbrev=8)

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ Infrastucture][1] (OCI).
77
[![wercker status](https://app.wercker.com/status/17a52304e0309d138ad41f7ae9f9ea49/s/master "wercker status")](https://app.wercker.com/project/byKey/17a52304e0309d138ad41f7ae9f9ea49)
88
[![Go Report Card](https://goreportcard.com/badge/github.com/oracle/oci-cloud-controller-manager)](https://goreportcard.com/report/github.com/oracle/oci-cloud-controller-manager)
99

10-
**WARNING**: this project is under active development and should be considered alpha.
11-
1210
## Introduction
1311

1412
External cloud providers were introduced as an _Alpha_ feature in Kubernetes

container-storage-interface.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ $ kubectl apply -f https://raw.githubusercontent.com/oracle/oci-cloud-controller
5656
Lastly, verify that the oci-csi-controller-driver and oci-csi-node-controller is running in your cluster. By default it runs in the 'kube-system' namespace.
5757

5858
```
59-
$ kubectl -n kube-system get po | grep oci-csi-controller-driver
60-
$ kubectl -n kube-system get po | grep oci-csi-node-controller
59+
$ kubectl -n kube-system get po | grep csi-oci-controller
60+
$ kubectl -n kube-system get po | grep csi-oci-node
6161
```
6262

6363
## Tutorial

flex-volume-provisioner.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ $ kubectl apply -f https://raw.githubusercontent.com/oracle/oci-cloud-controller
5151
Lastly, verify that the oci-volume-provisioner is running in your cluster. By default it runs in the 'kube-system' namespace.
5252

5353
```
54-
$ kubectl -n kube-system get po | grep oci-volume-provisioner
54+
$ kubectl -n kube-system get po | grep oci-block-volume-provisioner
5555
```
5656

5757
## Tutorial

manifests/container-storage-interface/oci-csi-node-driver.yaml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
---
2+
kind: ConfigMap
3+
apiVersion: v1
4+
metadata:
5+
name: oci-csi-iscsiadm
6+
namespace: kube-system
7+
data:
8+
iscsiadm: |
9+
#!/bin/sh
10+
if [ -x /host/sbin/iscsiadm ]; then
11+
chroot /host /sbin/iscsiadm "$@"
12+
elif [ -x /host/usr/local/sbin/iscsiadm ]; then
13+
chroot /host /usr/local/sbin/iscsiadm "$@"
14+
elif [ -x /host/bin/iscsiadm ]; then
15+
chroot /host /bin/iscsiadm "$@"
16+
elif [ -x /host/usr/local/bin/iscsiadm ]; then
17+
chroot /host /usr/local/bin/iscsiadm "$@"
18+
else
19+
chroot /host iscsiadm "$@"
20+
fi
21+
---
122
apiVersion: apps/v1
223
kind: DaemonSet
324
metadata:
@@ -33,6 +54,8 @@ spec:
3354
fieldRef:
3455
apiVersion: v1
3556
fieldPath: spec.nodeName
57+
- name: PATH
58+
value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/host/usr/bin:/host/sbin
3659
image: iad.ocir.io/oracle/cloud-provider-oci:latest
3760
securityContext:
3861
privileged: true
@@ -46,6 +69,11 @@ spec:
4669
name: device-dir
4770
- mountPath: /registration
4871
name: registration-dir
72+
- mountPath: /host
73+
name: host-root
74+
- mountPath: /sbin/iscsiadm
75+
name: chroot-iscsiadm
76+
subPath: iscsiadm
4977
- name: csi-node-registrar
5078
args:
5179
- --csi-address=/csi/csi.sock
@@ -98,6 +126,14 @@ spec:
98126
path: /dev
99127
type: ""
100128
name: device-dir
129+
- hostPath:
130+
path: /
131+
type: Directory
132+
name: host-root
133+
- configMap:
134+
name: oci-csi-iscsiadm
135+
defaultMode: 0755
136+
name: chroot-iscsiadm
101137
updateStrategy:
102138
rollingUpdate:
103139
maxUnavailable: 1

0 commit comments

Comments
 (0)