Merge pull request kubernetes#25 from Fedosin/fetch_upstream

Fetch latest changes from upstream

.github/ISSUE_TEMPLATE.md

@@ -1,4 +1,18 @@
-<!-- This form is for bug reports and feature requests! -->
+<!--
+Please add the affected binary name in the title unless multiple binaries are affected, e.g.
+[cinder-csi-plugin] Cannot delete PV
+For openstack-cloud-controller-manager, you can use [occm] for short.
+
+All the currently maintained binaries are:
+* openstack-cloud-controller-manager (occm)
+* cinder-csi-plugin
+* manila-csi-plugin
+* k8s-keystone-auth
+* client-keystone-auth
+* octavia-ingress-controller
+* magnum-auto-healer
+* barbican-kms-plugin
+-->
 
 **Is this a BUG REPORT or FEATURE REQUEST?**:
 
@@ -7,18 +21,6 @@
 > /kind bug
 > /kind feature
 
-**The binaries affected**:
-
-- [ ] openstack-cloud-controller-manager
-- [ ] cinder-csi-plugin
-- [ ] k8s-keystone-auth
-- [ ] client-keystone-auth
-- [ ] octavia-ingress-controller
-- [ ] manila-csi-plugin
-- [ ] manila-provisioner
-- [ ] magnum-auto-healer
-- [ ] barbican-kms-plugin
-
 **What happened**:
 
 
@@ -32,6 +34,6 @@
 
 
 **Environment**:
-- openstack-cloud-controller-manager version:
+- openstack-cloud-controller-manager(or other related binary) version:
 - OpenStack version:
 - Others:

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,39 +1,32 @@
-<!--  Thanks for sending a pull request!  Here are some tips for you:
-1. If this is your first time, read our contributor guidelines https://git.k8s.io/community/contributors/guide/pull-requests.md#the-pull-request-submit-process and developer guide https://git.k8s.io/community/contributors/devel/development.md#development-guide
-2. If you want *faster* PR reviews, read how: https://git.k8s.io/community/contributors/guide/pull-requests.md#best-practices-for-faster-reviews
-3. Follow the instructions for writing a release note: https://git.k8s.io/community/contributors/guide/release-notes.md
+<!--
+Please add the affected binary name in the title unless multiple binaries are affected, e.g.
+[cinder-csi-plugin] Fix volume deletion
+For openstack-cloud-controller-manager, you can use [occm] for short.
+
+All the currently maintained binaries are:
+* openstack-cloud-controller-manager (occm)
+* cinder-csi-plugin
+* manila-csi-plugin
+* k8s-keystone-auth
+* client-keystone-auth
+* octavia-ingress-controller
+* magnum-auto-healer
+* barbican-kms-plugin
 -->
 
-**The binaries affected**:
-
-IMPORTANT: Please also add the binary name in the title, e.g.
-`[openstack-cloud-controller-manager]: Add UDP protocol support`
-unless the PR affects multiple binaries.
-
-- [ ] openstack-cloud-controller-manager
-- [ ] cinder-csi-plugin
-- [ ] k8s-keystone-auth
-- [ ] client-keystone-auth
-- [ ] octavia-ingress-controller
-- [ ] manila-csi-plugin
-- [ ] manila-provisioner
-- [ ] magnum-auto-healer
-- [ ] barbican-kms-plugin
-
 **What this PR does / why we need it**:
 
-
-**Which issue this PR fixes**:
+**Which issue this PR fixes(if applicable)**:
 fixes #
 
 **Special notes for reviewers**:
-
 <!-- e.g. How to test this PR -->
 
 **Release note**:
-<!--  Steps to write your release note:
-1. Use the release-note-* labels to set the release note state (if you have access)
-2. Enter your extended release note in the below block; leaving it blank means using the PR title as the release note. If no release note is required, just write `NONE`.
+<!--
+1. Release note is required if a significant change is introduced, otherwise please keep this section as is.
+2. Release note is in Markdown format and should begin with the binary name unless multiple binaries are affected, e.g. [openstack-cloud-controller-manager] Deprecate Neutron-LBaaS support.
+3. Instructions for writing a release note: https://git.k8s.io/community/contributors/guide/release-notes.md
 -->
 ```release-note
 NONE

.gitignore

@@ -137,16 +137,18 @@ zz_generated.openapi.go
 
 # binaries
 /openstack-cloud-controller-manager
-/cinder-flex-volume-driver
-/cinder-provisioner
 /k8s-keystone-auth
 /cinder-csi-plugin
 /octavia-ingress-controller
 /client-keystone-auth
-/manila-provisioner
 /barbican-kms-plugin
 /magnum-auto-healer
 /manila-csi-plugin
+/*-amd64
+/*-arm
+/*-arm64
+/*-s390x
+/*-ppc64le
 
 # snap temp files
 /parts

.zuul.yaml

@@ -8,56 +8,64 @@
               - ^OWNERS$
               - ^SECURITY_CONTACTS$
               - ^.gitignore$
-    # Disable Octavia Job issue-750
-    # cloud-provider-openstack-acceptance-test-lb-octavia:
-    #   jobs:
-    #     - cloud-provider-openstack-acceptance-test-lb-octavia:
-    #         irrelevant-files:
-    #           - ^docs/.*$
-    #           - ^.*\.md$
-    #           - ^OWNERS$
-    #           - ^SECURITY_CONTACTS$
-    #           - ^.gitignore$
-    cloud-provider-openstack-format:
+              - ^.*\.sh$
+    cloud-provider-openstack-acceptance-test-lb-octavia:
       jobs:
-        - cloud-provider-openstack-format:
+        - cloud-provider-openstack-acceptance-test-lb-octavia:
+            files:
+              - cmd/openstack-cloud-controller-manager/.*
+              - pkg/cloudprovider/.*
+              - pkg/util/.*
+              - tests/e2e/cloudprovider/.*
+              - go.mod$
+              - go.sum$
+              - Makefile$
             irrelevant-files:
-              - ^docs/.*$
+              - docs/.*$
               - ^.*\.md$
               - ^OWNERS$
               - ^SECURITY_CONTACTS$
               - ^.gitignore$
-    cloud-provider-openstack-acceptance-test-keystone-authentication-authorization:
+    cloud-provider-openstack-format:
       jobs:
-        - cloud-provider-openstack-acceptance-test-keystone-authentication-authorization:
+        - cloud-provider-openstack-format:
             irrelevant-files:
               - ^docs/.*$
               - ^.*\.md$
               - ^OWNERS$
               - ^SECURITY_CONTACTS$
               - ^.gitignore$
-    cloud-provider-openstack-acceptance-test-k8s-cinder:
+              - ^.*\.sh$
+    cloud-provider-openstack-acceptance-test-keystone-authentication-authorization:
       jobs:
-        - cloud-provider-openstack-acceptance-test-k8s-cinder:
+        - cloud-provider-openstack-acceptance-test-keystone-authentication-authorization:
+            files:
+              - cmd/k8s-keystone-auth/.*
+              - pkg/identity/.*
+              - go.mod$
+              - go.sum$
+              - Makefile$
+              - tests/e2e/k8s-keystone-auth/.*
             irrelevant-files:
               - ^docs/.*$
               - ^.*\.md$
               - ^OWNERS$
               - ^SECURITY_CONTACTS$
               - ^.gitignore$
-    # Disable Standalone Cinder Driver Job as it is deprecated
-    # cloud-provider-openstack-acceptance-test-standalone-cinder:
-    #  jobs:
-    #    - cloud-provider-openstack-acceptance-test-standalone-cinder:
-    #        irrelevant-files:
-    #          - ^docs/.*$
-    #          - ^.*\.md$
-    #          - ^OWNERS$
-    #          - ^SECURITY_CONTACTS$
-    #          - ^.gitignore$
     cloud-provider-openstack-acceptance-test-csi-cinder:
       jobs:
         - cloud-provider-openstack-acceptance-test-csi-cinder:
+            files:
+              - cmd/cinder-csi-plugin/.*
+              - manifests/cinder-csi-plugin/.*
+              - pkg/csi/cinder/.*
+              - pkg/util/.*
+              - pkg/cloudprovider/providers/openstack/.*
+              - test/.*
+              - cmd/tests/.*
+              - go.mod$
+              - go.sum$
+              - Makefile$
             irrelevant-files:
               - ^docs/.*$
               - ^.*\.md$
@@ -68,31 +76,40 @@
       jobs:
         - cloud-provider-openstack-e2e-test-csi-cinder:
             files:
-              - ^pkg/csi/cinder/.*
-              - ^pkg/util/.*
-              - ^go.mod$
-              - ^go.sum$
-    cloud-provider-openstack-acceptance-test-flexvolume-cinder:
+              - cmd/cinder-csi-plugin/.*
+              - manifests/cinder-csi-plugin/.* 
+              - pkg/csi/cinder/.*
+              - pkg/util/.*
+              - test/.*
+              - cmd/tests/.*
+              - go.mod$
+              - go.sum$
+              - Makefile$
+    cloud-provider-openstack-multinode-csi-migration-test:
       jobs:
-        - cloud-provider-openstack-acceptance-test-flexvolume-cinder:
-            irrelevant-files:
-              - ^docs/.*$
-              - ^.*\.md$
-              - ^OWNERS$
-              - ^SECURITY_CONTACTS$
-              - ^.gitignore$
+        - cloud-provider-openstack-multinode-csi-migration-test:
+            files:
+              - cmd/cinder-csi-plugin/.*
+              - manifests/cinder-csi-plugin/.*
+              - pkg/csi/cinder/.*
+              - pkg/util/.*
+              - go.mod$
+              - go.sum$
+              - Makefile$
+              - .zuul.yaml$
     cloud-provider-openstack-acceptance-test-csi-manila:
       jobs:
         - cloud-provider-openstack-acceptance-test-csi-manila:
             files:
-              - ^cmd/manila-csi-plugin/.*
-              - ^examples/manila-csi-plugin/.*
-              - ^pkg/csi/manila/.*
-              - ^pkg/util/errors/.*
-              - ^pkg/cloudprovider/providers/openstack/.*
-              - ^pkg/share/manila/shareoptions/validator/.*
-              - ^go.mod$
-              - ^go.sum$
+              - cmd/manila-csi-plugin/.*
+              - examples/manila-csi-plugin/.*
+              - pkg/csi/manila/.*
+              - pkg/util/errors/.*
+              - pkg/cloudprovider/providers/openstack/.*
+              - pkg/share/manila/shareoptions/validator/.*
+              - go.mod$
+              - go.sum$
+              - Makefile$
             irrelevant-files:
               - ^docs/.*$
               - ^.*\.md$
@@ -103,48 +120,64 @@
       jobs:
         - cloud-provider-openstack-acceptance-test-e2e-conformance:
             files:
-              - ^pkg/cloudprovider/.*
-              - ^go.mod$
-              - ^go.sum$
+              - cmd/openstack-cloud-controller-manager/.*
+              - pkg/cloudprovider/.*
+              - pkg/util/.*
+              - tests/e2e/cloudprovider/.*
+              - go.mod$
+              - go.sum$
+              - Makefile$
             irrelevant-files:
               - ^docs/.*$
               - ^.*\.md$
               - ^OWNERS$
               - ^SECURITY_CONTACTS$
               - ^.gitignore$
-    cloud-provider-openstack-acceptance-test-e2e-conformance-stable-branch-v1.15:
+    cloud-provider-openstack-acceptance-test-e2e-conformance-stable-branch-v1.16:
       jobs:
-        - cloud-provider-openstack-acceptance-test-e2e-conformance-stable-branch-v1.15:
+        - cloud-provider-openstack-acceptance-test-e2e-conformance-stable-branch-v1.16:
             files:
-              - ^pkg/cloudprovider/.*
-              - ^go.mod$
-              - ^go.sum$
+              - cmd/openstack-cloud-controller-manager/.*
+              - pkg/cloudprovider/.*
+              - pkg/util/.*
+              - tests/e2e/cloudprovider/.*
+              - go.mod$
+              - go.sum$
+              - Makefile$
             irrelevant-files:
               - ^docs/.*$
               - ^.*\.md$
               - ^OWNERS$
               - ^SECURITY_CONTACTS$
               - ^.gitignore$
-    cloud-provider-openstack-acceptance-test-e2e-conformance-stable-branch-v1.16:
+    cloud-provider-openstack-acceptance-test-e2e-conformance-stable-branch-v1.17:
       jobs:
-        - cloud-provider-openstack-acceptance-test-e2e-conformance-stable-branch-v1.16:
+        - cloud-provider-openstack-acceptance-test-e2e-conformance-stable-branch-v1.17:
             files:
-              - ^pkg/cloudprovider/.*
-              - ^go.mod$
-              - ^go.sum$
+              - cmd/openstack-cloud-controller-manager/.*
+              - pkg/cloudprovider/.*
+              - pkg/util/.*
+              - tests/e2e/cloudprovider/.*
+              - go.mod$
+              - go.sum$
+              - Makefile$
             irrelevant-files:
               - ^docs/.*$
               - ^.*\.md$
               - ^OWNERS$
               - ^SECURITY_CONTACTS$
               - ^.gitignore$
-    cloud-provider-openstack-acceptance-test-e2e-conformance-stable-branch-v1.17:
+    cloud-provider-openstack-acceptance-test-e2e-conformance-stable-branch-v1.18:
       jobs:
-        - cloud-provider-openstack-acceptance-test-e2e-conformance-stable-branch-v1.17:
+        - cloud-provider-openstack-acceptance-test-e2e-conformance-stable-branch-v1.18:
             files:
-              - ^pkg/cloudprovider/.*
-              - ^go.mod$
-              - ^go.sum$
+              - cmd/openstack-cloud-controller-manager/.*
+              - pkg/cloudprovider/.*
+              - pkg/util/.*
+              - tests/e2e/cloudprovider/.*
+              - go.mod$
+              - go.sum$
+              - Makefile$
             irrelevant-files:
               - ^docs/.*$
               - ^.*\.md$