Merge pull request #157 from shiftstack/merge-bot-master

Merge https://github.com/kubernetes/cloud-provider-openstack:master into master

Author: openshift-merge-robot

README.md

@@ -17,6 +17,7 @@ This Repository hosts various plugins relevant to OpenStack and Kubernetes Integ
 
 * Cinder Standalone Provisioner, Manila Provisioner and Cinder FlexVolume Driver were removed since release v1.18.0.
 * Version 1.17 was the last release of Manila Provisioner, which is unmaintained from now on. Due to dependency issues, we removed the code from master but it is still accessible in the [release-1.17](https://github.com/kubernetes/cloud-provider-openstack/tree/release-1.17) branch. Please consider migrating to Manila CSI Plugin.
+* Start from release v1.26.0, neutron lbaasv1 support is removed and only Octavia is supported.
 
 ## Developing
 

charts/cinder-csi-plugin/templates/controllerplugin-deployment.yaml

@@ -32,6 +32,7 @@ spec:
             - "--csi-address=$(ADDRESS)"
             - "--timeout={{ .Values.timeout }}"
             - "--leader-election=true"
+            - "--default-fstype=ext4"
           env:
             - name: ADDRESS
               value: /var/lib/csi/sockets/pluginproxy/csi.sock

charts/cinder-csi-plugin/values.yaml

@@ -8,32 +8,32 @@ csi:
   attacher:
     image:
       repository: k8s.gcr.io/sig-storage/csi-attacher
-      tag: v3.4.0
+      tag: v4.0.0
       pullPolicy: IfNotPresent
     resources: {}
   provisioner:
     topology: "true"
     image:
       repository: k8s.gcr.io/sig-storage/csi-provisioner
-      tag: v3.1.0
+      tag: v3.4.0
       pullPolicy: IfNotPresent
     resources: {}
   snapshotter:
     image:
       repository: k8s.gcr.io/sig-storage/csi-snapshotter
-      tag: v5.0.1
+      tag: v6.1.0
       pullPolicy: IfNotPresent
     resources: {}
   resizer:
     image:
       repository: k8s.gcr.io/sig-storage/csi-resizer
-      tag: v1.4.0
+      tag: v1.6.0
       pullPolicy: IfNotPresent
     resources: {}
   livenessprobe:
     image:
       repository: k8s.gcr.io/sig-storage/livenessprobe
-      tag: v2.6.0
+      tag: v2.8.0
       pullPolicy: IfNotPresent
     failureThreshold: 5
     initialDelaySeconds: 10
@@ -43,7 +43,7 @@ csi:
   nodeDriverRegistrar:
     image:
       repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar
-      tag: v2.5.0
+      tag: v2.6.2
       pullPolicy: IfNotPresent
     resources: {}
   plugin:
@@ -85,15 +85,6 @@ csi:
       nodeSelector: {}
       tolerations: []
     resources: {}
-  snapshotController:
-    enabled: false
-    image:
-      repository: k8s.gcr.io/sig-storage/snapshot-controller
-      tag: v5.0.1
-    resources: {}
-    affinity: {}
-    nodeSelector: {}
-    tolerations: []
 
 # Log verbosity level.
 # See https://github.com/kubernetes/community/blob/master/contributors/devel/sig-instrumentation/logging.md
@@ -136,7 +127,7 @@ storageClass:
 #     parameters:
 #       type: SAS
 #     ---
-#     apiVersion: snapshot.storage.k8s.io/v1beta1
+#     apiVersion: snapshot.storage.k8s.io/v1
 #     kind: VolumeSnapshotClass
 #     metadata:
 #       name: csi-cinder-snapclass

docs/openstack-cloud-controller-manager/expose-applications-using-loadbalancer-type-service.md

@@ -244,7 +244,6 @@ username="myuser"
 password="mypassword"
 
 [LoadBalancer]
-use-octavia=true
 floating-network-id="a57af0a0-da92-49be-a98a-345ceca004b3"
 floating-subnet-id="a02eb6c3-fc69-46ae-a3fe-fb43c1563cbc"
 subnet-id="fa6a4e6c-6ae4-4dde-ae86-3e2f452c1f03"

docs/openstack-cloud-controller-manager/using-openstack-cloud-controller-manager.md

@@ -182,9 +182,6 @@ Although the openstack-cloud-controller-manager was initially implemented with N
   Whether or not to enable the LoadBalancer type of Services integration at all.
    Default: true
 
-* `use-octavia`
-  Whether or not to use Octavia for LoadBalancer type of Service implementation instead of using Neutron-LBaaS. Default: true
-
 * `floating-network-id`
   Optional. The external network used to create floating IP for the load balancer VIP. If there are multiple external networks in the cloud, either this option must be set or user must specify `loadbalancer.openstack.org/floating-network-id` in the Service annotation.
 
@@ -240,7 +237,7 @@ Although the openstack-cloud-controller-manager was initially implemented with N
   The id of the loadbalancer flavor to use. Uses octavia default if not set.
 
 * `availability-zone`
-  The name of the loadbalancer availability zone to use. It is applicable if use-octavia is set to True and requires Octavia API version 2.14 or later (Ussuri release). The Octavia availability zone capabilities will not be used if it is not set. The parameter will be ignored if the Octavia version doesn't support availability zones yet.
+  The name of the loadbalancer availability zone to use. The Octavia availability zone capabilities will not be used if it is not set. The parameter will be ignored if the Octavia version doesn't support availability zones yet.
 
 * `LoadBalancerClass "ClassName"`
   This is a config section including a set of config options. User can choose the `ClassName` by specifying the Service annotation `loadbalancer.openstack.org/class`. The following options are supported:

manifests/cinder-csi-plugin/cinder-csi-controllerplugin.yaml

@@ -25,11 +25,12 @@ spec:
       serviceAccount: csi-cinder-controller-sa
       containers:
         - name: csi-attacher
-          image: k8s.gcr.io/sig-storage/csi-attacher:v3.4.0
+          image: k8s.gcr.io/sig-storage/csi-attacher:v4.0.0
           args:
             - "--csi-address=$(ADDRESS)"
             - "--timeout=3m"
             - "--leader-election=true"
+            - "--default-fstype=ext4"
           env:
             - name: ADDRESS
               value: /var/lib/csi/sockets/pluginproxy/csi.sock
@@ -38,7 +39,7 @@ spec:
             - name: socket-dir
               mountPath: /var/lib/csi/sockets/pluginproxy/
         - name: csi-provisioner
-          image: k8s.gcr.io/sig-storage/csi-provisioner:v3.1.0
+          image: k8s.gcr.io/sig-storage/csi-provisioner:v3.3.0
           args:
             - "--csi-address=$(ADDRESS)"
             - "--timeout=3m"
@@ -54,7 +55,7 @@ spec:
             - name: socket-dir
               mountPath: /var/lib/csi/sockets/pluginproxy/
         - name: csi-snapshotter
-          image: k8s.gcr.io/sig-storage/csi-snapshotter:v6.0.1
+          image: k8s.gcr.io/sig-storage/csi-snapshotter:v6.1.0
           args:
             - "--csi-address=$(ADDRESS)"
             - "--timeout=3m"
@@ -82,7 +83,7 @@ spec:
             - name: socket-dir
               mountPath: /var/lib/csi/sockets/pluginproxy/
         - name: liveness-probe
-          image: k8s.gcr.io/sig-storage/livenessprobe:v2.7.0
+          image: k8s.gcr.io/sig-storage/livenessprobe:v2.8.0
           args:
             - "--csi-address=$(ADDRESS)"
           env:
@@ -98,6 +99,7 @@ spec:
             - "--endpoint=$(CSI_ENDPOINT)"
             - "--cloud-config=$(CLOUD_CONFIG)"
             - "--cluster=$(CLUSTER_NAME)"
+            - "--v=1"
           env:
             - name: CSI_ENDPOINT
               value: unix://csi/csi.sock

manifests/cinder-csi-plugin/cinder-csi-nodeplugin.yaml

@@ -21,7 +21,7 @@ spec:
       hostNetwork: true
       containers:
         - name: node-driver-registrar
-          image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.1
+          image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.6.2
           args:
             - "--csi-address=$(ADDRESS)"
             - "--kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)"
@@ -41,7 +41,7 @@ spec:
             - name: registration-dir
               mountPath: /registration
         - name: liveness-probe
-          image: k8s.gcr.io/sig-storage/livenessprobe:v2.7.0
+          image: k8s.gcr.io/sig-storage/livenessprobe:v2.8.0
           args:
             - --csi-address=/csi/csi.sock
           volumeMounts:
@@ -58,6 +58,7 @@ spec:
             - /bin/cinder-csi-plugin
             - "--endpoint=$(CSI_ENDPOINT)"
             - "--cloud-config=$(CLOUD_CONFIG)"
+            - "--v=1"
           env:
             - name: CSI_ENDPOINT
               value: unix://csi/csi.sock

manifests/controller-manager/cloud-config

@@ -11,6 +11,5 @@ tenant-id=
 domain-id=
 
 [LoadBalancer]
-use-octavia=true
 subnet-id=9c018814-f2a8-45dd-9679-5400d49b333a
-floating-network-id=80c9fc78-a2be-45d5-a85b-f17a6c98df92
+floating-network-id=80c9fc78-a2be-45d5-a85b-f17a6c98df92

pkg/client/service.go

@@ -51,14 +51,10 @@ func NewBlockStorageV3(provider *gophercloud.ProviderClient, eo *gophercloud.End
 }
 
 // NewLoadBalancerV2 creates a ServiceClient that may be used with the Neutron LBaaS v2 API
-func NewLoadBalancerV2(provider *gophercloud.ProviderClient, eo *gophercloud.EndpointOpts, useOctavia bool) (*gophercloud.ServiceClient, error) {
+func NewLoadBalancerV2(provider *gophercloud.ProviderClient, eo *gophercloud.EndpointOpts) (*gophercloud.ServiceClient, error) {
 	var lb *gophercloud.ServiceClient
 	var err error
-	if useOctavia {
-		lb, err = openstack.NewLoadBalancerV2(provider, *eo)
-	} else {
-		lb, err = openstack.NewNetworkV2(provider, *eo)
-	}
+	lb, err = openstack.NewLoadBalancerV2(provider, *eo)
 	if err != nil {
 		return nil, fmt.Errorf("failed to find load-balancer v2 %s endpoint for region %s: %v", eo.Availability, eo.Region, err)
 	}