Bug 1820238: Fetch latest changes from upstream

.zuul.yaml

@@ -30,7 +30,6 @@
       jobs:
         - cloud-provider-openstack-format:
             irrelevant-files:
-              - ^docs/.*$
               - ^.*\.md$
               - ^OWNERS$
               - ^SECURITY_CONTACTS$

Makefile

@@ -43,6 +43,7 @@ GOARCH		:=
 GOFLAGS		:=
 TAGS		:=
 LDFLAGS		:= "-w -s -X 'k8s.io/cloud-provider-openstack/pkg/version.Version=${VERSION}'"
+GOX_LDFLAGS	:= $(shell echo "$(LDFLAGS) -extldflags \"-static\"")
 REGISTRY	?= k8scloudprovider
 IMAGE_OS	?= linux
 IMAGE_NAMES	?= openstack-cloud-controller-manager \
@@ -303,19 +304,18 @@ version:
 	@echo ${VERSION}
 
 .PHONY: build-cross
-build-cross: LDFLAGS += -extldflags "-static"
 build-cross: work
 ifndef HAS_GOX
 	echo "installing gox"
-	GO111MODULE=off go get -u github.com/mitchellh/gox
+	go get -u github.com/mitchellh/gox
 endif
-	CGO_ENABLED=0 gox -parallel=$(GOX_PARALLEL) -output="_dist/{{.OS}}-{{.Arch}}/{{.Dir}}" -osarch='$(TARGETS)' $(GOFLAGS) $(if $(TAGS),-tags '$(TAGS)',) -ldflags '$(LDFLAGS)' $(GIT_HOST)/$(BASE_DIR)/cmd/openstack-cloud-controller-manager/
-	CGO_ENABLED=0 gox -parallel=$(GOX_PARALLEL) -output="_dist/{{.OS}}-{{.Arch}}/{{.Dir}}" -osarch='$(TARGETS)' $(GOFLAGS) $(if $(TAGS),-tags '$(TAGS)',) -ldflags '$(LDFLAGS)' $(GIT_HOST)/$(BASE_DIR)/cmd/cinder-csi-plugin/
-	CGO_ENABLED=0 gox -parallel=$(GOX_PARALLEL) -output="_dist/{{.OS}}-{{.Arch}}/{{.Dir}}" -osarch='$(TARGETS)' $(GOFLAGS) $(if $(TAGS),-tags '$(TAGS)',) -ldflags '$(LDFLAGS)' $(GIT_HOST)/$(BASE_DIR)/cmd/k8s-keystone-auth/
-	CGO_ENABLED=0 gox -parallel=$(GOX_PARALLEL) -output="_dist/{{.OS}}-{{.Arch}}/{{.Dir}}" -osarch='$(TARGETS)' $(GOFLAGS) $(if $(TAGS),-tags '$(TAGS)',) -ldflags '$(LDFLAGS)' $(GIT_HOST)/$(BASE_DIR)/cmd/client-keystone-auth/
-	CGO_ENABLED=0 gox -parallel=$(GOX_PARALLEL) -output="_dist/{{.OS}}-{{.Arch}}/{{.Dir}}" -osarch='$(TARGETS)' $(GOFLAGS) $(if $(TAGS),-tags '$(TAGS)',) -ldflags '$(LDFLAGS)' $(GIT_HOST)/$(BASE_DIR)/cmd/octavia-ingress-controller/
-	CGO_ENABLED=0 gox -parallel=$(GOX_PARALLEL) -output="_dist/{{.OS}}-{{.Arch}}/{{.Dir}}" -osarch='$(TARGETS)' $(GOFLAGS) $(if $(TAGS),-tags '$(TAGS)',) -ldflags '$(LDFLAGS)' $(GIT_HOST)/$(BASE_DIR)/cmd/manila-csi-plugin/
-	CGO_ENABLED=0 gox -parallel=$(GOX_PARALLEL) -output="_dist/{{.OS}}-{{.Arch}}/{{.Dir}}" -osarch='$(TARGETS)' $(GOFLAGS) $(if $(TAGS),-tags '$(TAGS)',) -ldflags '$(LDFLAGS)' $(GIT_HOST)/$(BASE_DIR)/cmd/magnum-auto-healer/
+	CGO_ENABLED=0 gox -parallel=$(GOX_PARALLEL) -output="_dist/{{.OS}}-{{.Arch}}/{{.Dir}}" -osarch='$(TARGETS)' $(GOFLAGS) $(if $(TAGS),-tags '$(TAGS)',) -ldflags '$(GOX_LDFLAGS)' $(GIT_HOST)/$(BASE_DIR)/cmd/openstack-cloud-controller-manager/
+	CGO_ENABLED=0 gox -parallel=$(GOX_PARALLEL) -output="_dist/{{.OS}}-{{.Arch}}/{{.Dir}}" -osarch='$(TARGETS)' $(GOFLAGS) $(if $(TAGS),-tags '$(TAGS)',) -ldflags '$(GOX_LDFLAGS)' $(GIT_HOST)/$(BASE_DIR)/cmd/cinder-csi-plugin/
+	CGO_ENABLED=0 gox -parallel=$(GOX_PARALLEL) -output="_dist/{{.OS}}-{{.Arch}}/{{.Dir}}" -osarch='$(TARGETS)' $(GOFLAGS) $(if $(TAGS),-tags '$(TAGS)',) -ldflags '$(GOX_LDFLAGS)' $(GIT_HOST)/$(BASE_DIR)/cmd/k8s-keystone-auth/
+	CGO_ENABLED=0 gox -parallel=$(GOX_PARALLEL) -output="_dist/{{.OS}}-{{.Arch}}/{{.Dir}}" -osarch='$(TARGETS)' $(GOFLAGS) $(if $(TAGS),-tags '$(TAGS)',) -ldflags '$(GOX_LDFLAGS)' $(GIT_HOST)/$(BASE_DIR)/cmd/client-keystone-auth/
+	CGO_ENABLED=0 gox -parallel=$(GOX_PARALLEL) -output="_dist/{{.OS}}-{{.Arch}}/{{.Dir}}" -osarch='$(TARGETS)' $(GOFLAGS) $(if $(TAGS),-tags '$(TAGS)',) -ldflags '$(GOX_LDFLAGS)' $(GIT_HOST)/$(BASE_DIR)/cmd/octavia-ingress-controller/
+	CGO_ENABLED=0 gox -parallel=$(GOX_PARALLEL) -output="_dist/{{.OS}}-{{.Arch}}/{{.Dir}}" -osarch='$(TARGETS)' $(GOFLAGS) $(if $(TAGS),-tags '$(TAGS)',) -ldflags '$(GOX_LDFLAGS)' $(GIT_HOST)/$(BASE_DIR)/cmd/manila-csi-plugin/
+	CGO_ENABLED=0 gox -parallel=$(GOX_PARALLEL) -output="_dist/{{.OS}}-{{.Arch}}/{{.Dir}}" -osarch='$(TARGETS)' $(GOFLAGS) $(if $(TAGS),-tags '$(TAGS)',) -ldflags '$(GOX_LDFLAGS)' $(GIT_HOST)/$(BASE_DIR)/cmd/magnum-auto-healer/
 
 .PHONY: dist
 dist: build-cross

README.md

@@ -4,22 +4,22 @@ Thank you for visiting the `Cloud Provider OpenStack` repository!
 
 This Repository hosts various plugins relevant to OpenStack and Kubernetes Integration
 
-* [OpenStack Cloud Controller Manager](/docs/using-openstack-cloud-controller-manager.md/)
-* [Octavia Ingress Controller](/docs/using-octavia-ingress-controller.md/)
+* [OpenStack Cloud Controller Manager](/docs/openstack-cloud-controller-manager/using-openstack-cloud-controller-manager.md/)
+* [Octavia Ingress Controller](/docs/octavia-ingress-controller/using-octavia-ingress-controller.md/)
 * [Cinder CSI Plugin](/docs/cinder-csi-plugin/using-cinder-csi-plugin.md/)
-* [Keystone Webhook Authentication Authorization](/docs/using-keystone-webhook-authenticator-and-authorizer.md/)
-* [Client Keystone](/docs/using-client-keystone-auth.md/)
-* [Manila CSI Plugin](/docs/using-manila-csi-plugin.md/)
-* [Barbican KMS Plugin](/docs/using-barbican-kms-plugin.md/)
-* [Magnum Auto Healer](/docs/using-magnum-auto-healer.md/)
+* [Keystone Webhook Authentication Authorization](/docs/keystone-auth/using-keystone-webhook-authenticator-and-authorizer.md/)
+* [Client Keystone](/docs/keystone-auth/using-client-keystone-auth.md/)
+* [Manila CSI Plugin](/docs/manila-csi-plugin/using-manila-csi-plugin.md/)
+* [Barbican KMS Plugin](/docs/barbican-kms-plugin/using-barbican-kms-plugin.md/)
+* [Magnum Auto Healer](/docs/magnum-auto-healer/using-magnum-auto-healer.md/)
 
 > NOTE: 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.
 
 ## Developing
 
-Please Refer [Getting Started Guide](/docs/getting-started-provider-dev.md/) for setting up development environment.
+Please Refer [Getting Started Guide](/docs/developers-guide.md/) for setting up development environment.
 
 ## Contact
 

charts/cinder-csi-plugin/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: latest
 description: Cinder CSI Chart for OpenStack
 name: openstack-cinder-csi
-version: 1.2.3
+version: 1.2.6
 home: https://github.com/kubernetes/cloud-provider-openstack
 icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png
 maintainers:

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

@@ -31,7 +31,7 @@ spec:
           imagePullPolicy: {{ .Values.csi.attacher.image.pullPolicy }}
           args:
             - "--csi-address=$(ADDRESS)"
-            - "--timeout=3m"
+            - "--timeout={{ .Values.timeout }}"
           env:
             - name: ADDRESS
               value: /var/lib/csi/sockets/pluginproxy/csi.sock
@@ -43,7 +43,7 @@ spec:
           imagePullPolicy: {{ .Values.csi.provisioner.image.pullPolicy }}
           args:
             - "--csi-address=$(ADDRESS)"
-            - "--timeout=3m"
+            - "--timeout={{ .Values.timeout }}"
           env:
             - name: ADDRESS
               value: /var/lib/csi/sockets/pluginproxy/csi.sock
@@ -55,6 +55,7 @@ spec:
           imagePullPolicy: {{ .Values.csi.snapshotter.image.pullPolicy }}
           args:
             - "--csi-address=$(ADDRESS)"
+            - "--timeout={{ .Values.timeout }}"
           env:
             - name: ADDRESS
               value: /var/lib/csi/sockets/pluginproxy/csi.sock
@@ -66,6 +67,7 @@ spec:
           imagePullPolicy: {{ .Values.csi.resizer.image.pullPolicy }}
           args:
             - "--csi-address=$(ADDRESS)"
+            - "--csiTimeout={{ .Values.timeout }}"
           env:
             - name: ADDRESS
               value: /var/lib/csi/sockets/pluginproxy/csi.sock

charts/cinder-csi-plugin/templates/nodeplugin-daemonset.yaml

@@ -13,6 +13,8 @@ spec:
       labels:
         {{- include "cinder-csi.nodeplugin.labels" . | nindent 8 }}
     spec:
+      tolerations:
+        - operator: Exists
       serviceAccount: csi-cinder-node-sa
       hostNetwork: true
       containers:

charts/cinder-csi-plugin/values.yaml

@@ -1,31 +1,32 @@
 nameOverride: ""
 fullnameOverride: ""
+timeout: 3m
 
 csi:
   attacher:
     image:
       repository: quay.io/k8scsi/csi-attacher
-      tag: v2.2.0
+      tag: v2.2.1
       pullPolicy: IfNotPresent
   provisioner:
     image:
       repository: quay.io/k8scsi/csi-provisioner
-      tag: v1.6.0
+      tag: v1.6.1
       pullPolicy: IfNotPresent
   snapshotter:
     image:
       repository: quay.io/k8scsi/csi-snapshotter
-      tag: v2.1.1
+      tag: v2.1.2
       pullPolicy: IfNotPresent
   resizer:
     image:
       repository: quay.io/k8scsi/csi-resizer
-      tag: v0.4.0
+      tag: v0.5.1
       pullPolicy: IfNotPresent
   nodeDriverRegistrar:
     image:
       repository: quay.io/k8scsi/csi-node-driver-registrar
-      tag: v1.2.0
+      tag: v1.3.0
       pullPolicy: IfNotPresent
   plugin:
     image:

charts/manila-csi-plugin/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: latest
 description: Manila CSI Chart for OpenStack
 name: openstack-manila-csi
-version: 1.0.0
+version: 1.0.1
 home: http://github.com/kubernetes/cloud-provider-openstack
 icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png
 maintainers:

charts/manila-csi-plugin/templates/controllerplugin-statefulset.yaml

@@ -135,15 +135,12 @@ spec:
           hostPath:
             path: /var/lib/kubelet/pods
             type: Directory
-    {{- if .Values.controllerplugin.affinity -}}
-      affinity:
-{{ toYaml .Values.controllerplugin.affinity . | indent 8 }}
-    {{- end -}}
-    {{- if .Values.controllerplugin.nodeSelector -}}
-      nodeSelector:
-{{ toYaml .Values.controllerplugin.nodeSelector | indent 8 }}
-    {{- end -}}
-    {{- if .Values.controllerplugin.tolerations -}}
-      tolerations:
-{{ toYaml .Values.controllerplugin.tolerations | indent 8 }}
-    {{- end -}}
+    {{- if .Values.controllerplugin.affinity }}
+      affinity: {{ toYaml .Values.controllerplugin.affinity | nindent 8 }}
+    {{- end }}
+    {{- if .Values.controllerplugin.nodeSelector }}
+      nodeSelector: {{ toYaml .Values.controllerplugin.nodeSelector | nindent 8 }}
+    {{- end }}
+    {{- if .Values.controllerplugin.tolerations }}
+      tolerations: {{ toYaml .Values.controllerplugin.tolerations | nindent 8 }}
+    {{- end }}

charts/manila-csi-plugin/templates/nodeplugin-daemonset.yaml

@@ -125,15 +125,12 @@ spec:
             name: manila-csi-runtimeconf-cm
         {{- end }}
         {{- end }}
-    {{- if .Values.nodeplugin.affinity -}}
-      affinity:
-{{ toYaml .Values.nodeplugin.affinity . | indent 8 }}
-    {{- end -}}
-    {{- if .Values.nodeplugin.nodeSelector -}}
-      nodeSelector:
-{{ toYaml .Values.nodeplugin.nodeSelector | indent 8 }}
-    {{- end -}}
-    {{- if .Values.nodeplugin.tolerations -}}
-      tolerations:
-{{ toYaml .Values.nodeplugin.tolerations | indent 8 }}
-    {{- end -}}
+    {{- if .Values.nodeplugin.affinity }}
+      affinity: {{ toYaml .Values.nodeplugin.affinity | nindent 8 }}
+    {{- end }}
+    {{- if .Values.nodeplugin.nodeSelector }}
+      nodeSelector: {{ toYaml .Values.nodeplugin.nodeSelector | nindent 8 }}
+    {{- end }}
+    {{- if .Values.nodeplugin.tolerations }}
+      tolerations: {{ toYaml .Values.nodeplugin.tolerations | nindent 8 }}
+    {{- end }}