Skip to content

Commit

Permalink
prepare release 1.30.2 (#2724)
Browse files Browse the repository at this point in the history
* prepare release 1.30.2

* update deps

* use k8s 1.30.7

* Fix CSI tests (#2712)

* [tests] bump devstack branch to stable/2023.2, fix python issues (#2716)

* [tests] bump ubuntu to 24.04 jammy (#2721)

---------

Co-authored-by: pýrus <[email protected]>
  • Loading branch information
zetaab and kayrus authored Nov 23, 2024
1 parent 246e057 commit 3433634
Show file tree
Hide file tree
Showing 27 changed files with 123 additions and 102 deletions.
4 changes: 2 additions & 2 deletions charts/cinder-csi-plugin/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v1
appVersion: v1.30.1
appVersion: v1.30.2
description: Cinder CSI Chart for OpenStack
name: openstack-cinder-csi
version: 2.30.1
version: 2.30.2
home: https://github.com/kubernetes/cloud-provider-openstack
icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png
maintainers:
Expand Down
4 changes: 2 additions & 2 deletions charts/manila-csi-plugin/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v1
appVersion: v1.30.1
appVersion: v1.30.2
description: Manila CSI Chart for OpenStack
name: openstack-manila-csi
version: 2.30.1
version: 2.30.2
home: http://github.com/kubernetes/cloud-provider-openstack
icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png
maintainers:
Expand Down
4 changes: 2 additions & 2 deletions charts/openstack-cloud-controller-manager/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
apiVersion: v2
appVersion: v1.30.1
appVersion: v1.30.2
description: Openstack Cloud Controller Manager Helm Chart
icon: https://object-storage-ca-ymq-1.vexxhost.net/swift/v1/6e4619c416ff4bd19e1c087f27a43eea/www-images-prod/openstack-logo/OpenStack-Logo-Vertical.png
home: https://github.com/kubernetes/cloud-provider-openstack
name: openstack-cloud-controller-manager
version: 2.30.3
version: 2.30.4
maintainers:
- name: eumel8
email: [email protected]
Expand Down
6 changes: 3 additions & 3 deletions docs/developers-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Choose the one you are familiar with and easy to customize. Config the cluster w
Using kubeadm, openstack-cloud-controller-manager can be deployed easily with predefined manifests, see the [deployment guide with kubeadm](openstack-cloud-controller-manager/using-openstack-cloud-controller-manager.md#deploy-a-kubernetes-cluster-with-openstack-cloud-controller-manager-using-kubeadm).

### DevStack-based testing environment
You can also use our CI scripts to setup a simple development environment based on DevStack and k3s. To do so you need a fresh VM with Ubuntu 22.04. We've tested this with 4 vCPUs and 16 GB of RAM and that's recommended, but we never tested the lower bound, so feel free to try with less resources.
You can also use our CI scripts to setup a simple development environment based on DevStack and k3s. To do so you need a fresh VM with Ubuntu 24.04. We've tested this with 4 vCPUs and 16 GB of RAM and that's recommended, but we never tested the lower bound, so feel free to try with less resources.

Once the VM is up make sure your SSH keys allow logging in as `ubuntu` user and from your PC and cloud-provider-openstack directory run:

Expand Down Expand Up @@ -133,11 +133,11 @@ make unit

End-to-end or _e2e_ tests are more complex to run as they require a functioning OpenStack cloud and Kubernetes (well, k3s) deployment. Fortunately, you can rely on the infrastructure used for CI to run this on your own machines.

For example, to run the Cinder CSI e2e tests, the CI calls the `tests/ci-csi-cinder-e2e.sh` script. Inspecting this, you'll note that a lot of the commands in here are simply provisioning an instance on GCE, using [Boskos](https://github.com/kubernetes-sigs/boskos) to manage static resources (projects, in this case) if needed. If you have a set of GCE credentials, then in theory you could run this script as-is. However, all you need is a VM with sufficient resources and network connectivity running the correct image (Ubuntu 20.04 cloud image as of writing - check `tests/scripts/create-gce-vm.sh` for the latest info). For example, using OpenStack:
For example, to run the Cinder CSI e2e tests, the CI calls the `tests/ci-csi-cinder-e2e.sh` script. Inspecting this, you'll note that a lot of the commands in here are simply provisioning an instance on GCE, using [Boskos](https://github.com/kubernetes-sigs/boskos) to manage static resources (projects, in this case) if needed. If you have a set of GCE credentials, then in theory you could run this script as-is. However, all you need is a VM with sufficient resources and network connectivity running the correct image (Ubuntu 24.04 cloud image as of writing - check `tests/scripts/create-gce-vm.sh` for the latest info). For example, using OpenStack:

```
openstack server create \
--image ubuntu2004 \
--image ubuntu2404 \
--flavor m1.large \
--key-name <key-name> \
--network <network> \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ it as a service. There are several things we need to notice in the
deployment manifest:

- We are using image
`registry.k8s.io/provider-os/k8s-keystone-auth:v1.30.1`
`registry.k8s.io/provider-os/k8s-keystone-auth:v1.30.2`
- We use `k8s-auth-policy` configmap created above.
- The pod uses service account `keystone-auth` created above.
- We use `keystone-auth-certs` secret created above to inject the
Expand Down
2 changes: 1 addition & 1 deletion docs/magnum-auto-healer/using-magnum-auto-healer.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ user_id=ceb61464a3d341ebabdf97d1d4b97099
user_project_id=b23a5e41d1af4c20974bf58b4dff8e5a
password=password
region=RegionOne
image=registry.k8s.io/provider-os/magnum-auto-healer:v1.30.1
image=registry.k8s.io/provider-os/magnum-auto-healer:v1.30.2
cat <<EOF | kubectl apply -f -
---
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ Here are several other config options are not included in the example configurat
### Deploy octavia-ingress-controller

```shell
image="registry.k8s.io/provider-os/octavia-ingress-controller:v1.30.1"
image="registry.k8s.io/provider-os/octavia-ingress-controller:v1.30.2"
cat <<EOF > /etc/kubernetes/octavia-ingress-controller/deployment.yaml
---
Expand Down
2 changes: 1 addition & 1 deletion examples/webhook/keystone-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
serviceAccountName: k8s-keystone
containers:
- name: k8s-keystone-auth
image: registry.k8s.io/provider-os/k8s-keystone-auth:v1.30.1
image: registry.k8s.io/provider-os/k8s-keystone-auth:v1.30.2
args:
- ./bin/k8s-keystone-auth
- --tls-cert-file
Expand Down
50 changes: 25 additions & 25 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -29,31 +29,31 @@ require (
gopkg.in/gcfg.v1 v1.2.3
gopkg.in/godo.v2 v2.0.9
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.30.5
k8s.io/apimachinery v0.30.5
k8s.io/apiserver v0.30.5
k8s.io/client-go v0.30.5
k8s.io/cloud-provider v0.30.5
k8s.io/component-base v0.30.5
k8s.io/api v0.30.7
k8s.io/apimachinery v0.30.7
k8s.io/apiserver v0.30.7
k8s.io/client-go v0.30.7
k8s.io/cloud-provider v0.30.7
k8s.io/component-base v0.30.7
k8s.io/klog/v2 v2.120.1
k8s.io/kms v0.30.5
k8s.io/kubernetes v1.30.5
k8s.io/mount-utils v0.30.5
k8s.io/kms v0.30.7
k8s.io/kubernetes v1.30.7
k8s.io/mount-utils v0.30.7
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
software.sslmate.com/src/go-pkcs12 v0.2.0
)

// the below fixes the "go list -m all" execution
replace (
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.5
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.30.5
k8s.io/endpointslice => k8s.io/endpointslice v0.30.5
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.5
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.5
k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.5
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.5
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.5
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.5
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.7
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.30.7
k8s.io/endpointslice => k8s.io/endpointslice v0.30.7
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.7
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.7
k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.7
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.7
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.7
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.7
)

require (
Expand Down Expand Up @@ -153,14 +153,14 @@ require (
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.30.5 // indirect
k8s.io/component-helpers v0.30.5 // indirect
k8s.io/controller-manager v0.30.5 // indirect
k8s.io/csi-translation-lib v0.30.5 // indirect
k8s.io/apiextensions-apiserver v0.30.7 // indirect
k8s.io/component-helpers v0.30.7 // indirect
k8s.io/controller-manager v0.30.7 // indirect
k8s.io/csi-translation-lib v0.30.7 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
k8s.io/kubectl v0.30.5 // indirect
k8s.io/kubelet v0.30.5 // indirect
k8s.io/pod-security-admission v0.30.5 // indirect
k8s.io/kubectl v0.30.7 // indirect
k8s.io/kubelet v0.30.7 // indirect
k8s.io/pod-security-admission v0.30.7 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
Expand Down
64 changes: 32 additions & 32 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -846,43 +846,43 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.30.5 h1:Coz05sfEVywzGcA96AJPUfs2B8LBMnh+IIsM+HCfaz8=
k8s.io/api v0.30.5/go.mod h1:HfNBGFvq9iNK8dmTKjYIdAtMxu8BXTb9c1SJyO6QjKs=
k8s.io/apiextensions-apiserver v0.30.5 h1:JfXTIyzXf5+ryncbp7T/uaVjLdvkwtqoNG2vo7S2a6M=
k8s.io/apiextensions-apiserver v0.30.5/go.mod h1:uVLEME2UPA6UN22i+jTu66B9/0CnsjlHkId+Awo0lvs=
k8s.io/apimachinery v0.30.5 h1:CQZO19GFgw4zcOjY2H+mJ3k1u1o7zFACTNCB7nu4O18=
k8s.io/apimachinery v0.30.5/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
k8s.io/apiserver v0.30.5 h1:roo3cfvUS7zvI6u+bY35Xv3rSDXbY9dwl1gN+rxx0S4=
k8s.io/apiserver v0.30.5/go.mod h1:p5UqIn1WPdOFo7uO/ZUdX464hHZy1DP384znr7FOIXA=
k8s.io/client-go v0.30.5 h1:vEDSzfTz0F8TXcWVdXl+aqV7NAV8M3UvC2qnGTTCoKw=
k8s.io/client-go v0.30.5/go.mod h1:/q5fHHBmhAUesOOFJACpD7VJ4e57rVtTPDOsvXrPpMk=
k8s.io/cloud-provider v0.30.5 h1:rkJvDNMZUNoRoRQNQ9iaW7AqayXQT2Fa65JRBjfQBf8=
k8s.io/cloud-provider v0.30.5/go.mod h1:bKNgnDb9iSw2ymV/wFAgTG9jgpvRiF/2LM/KqmmWycQ=
k8s.io/component-base v0.30.5 h1:O6W8GfdBuyctVy7lu7I0yo8kB6bYgzGzjCyaagb2BR0=
k8s.io/component-base v0.30.5/go.mod h1:eliJtfE7RG18UHMWrqPQWodf1GnQVFGA6McNOHYi11g=
k8s.io/component-helpers v0.30.5 h1:jXrCpym8Ed+FyhqO/djlC0YHmiiV+ZlLcQhl1GXprD0=
k8s.io/component-helpers v0.30.5/go.mod h1:zNV3WR4ZUfFFDRpv5Gs2a+Ey3LtZ8ilFiKqxF90dLG4=
k8s.io/controller-manager v0.30.5 h1:aBgRd2hDJ25x6W86FFj/DI27uQQD757OZUgdFjrzzqM=
k8s.io/controller-manager v0.30.5/go.mod h1:CoCm8RhJrZCue2pYHhc/eZ72ogPPZEhDHJV/FWxOaU4=
k8s.io/csi-translation-lib v0.30.5 h1:QKtVWzqGBLfJhjHUCb4lnUiuYSjYFPfP+VtjUQ+wF0I=
k8s.io/csi-translation-lib v0.30.5/go.mod h1:/P9f7OKEvHTnk0Fs8kAotEWPXkZA9skLFda8oeCU3u8=
k8s.io/api v0.30.7 h1:wB2eHI+IptVYsz5WsAQpI6+Dqi3+11wEWBqIh4fh980=
k8s.io/api v0.30.7/go.mod h1:bR0EwbmhYmJvUoeza7ZzBUmYCrVXccQ9JOdfv0BxhH0=
k8s.io/apiextensions-apiserver v0.30.7 h1:YR2iohbfRWmN6q5ukmiFrkKHFAij5Ic4+tSBZu2nvVc=
k8s.io/apiextensions-apiserver v0.30.7/go.mod h1:Uo13fs4VGPuu6SbQ/TTLTExbVQJBGvCtBNtPU526Uj4=
k8s.io/apimachinery v0.30.7 h1:CoQFxvzPFKwU1eJGN/8LgM3ZJBC3hKgvwGqRrL43uIY=
k8s.io/apimachinery v0.30.7/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
k8s.io/apiserver v0.30.7 h1:4tKcwejf+OmBniwtXAXvwGce6K+G0Q4s5bWugap4d0Y=
k8s.io/apiserver v0.30.7/go.mod h1:oj6q6jJtJWxHuavNRxFp6nhUxi8UX07HZIFKu1eWYjs=
k8s.io/client-go v0.30.7 h1:DQRfuGWxDzxPEyyiTE/fxzAsZcj2p9sbc5671njR52w=
k8s.io/client-go v0.30.7/go.mod h1:oED9+njB91ExCc4BNPAotniB7WH1ig7CmiBx5pVA1yw=
k8s.io/cloud-provider v0.30.7 h1:RNt+A3W9Mz3J5nb5GTDG4jhbLE+VEHnXky4+HN4Tj8c=
k8s.io/cloud-provider v0.30.7/go.mod h1:yuxkkxKZ9GDOHVGD9b912J13X1miaq08N0sc6hosH3k=
k8s.io/component-base v0.30.7 h1:wtbQWLzj5xAGjz+/U/nYNnAc8+wpTUvCqN0uZuCuFF8=
k8s.io/component-base v0.30.7/go.mod h1:UjPOkWiDcvUiQRTpbr3kghl+pFMtFSgqYbWKHKRcXJc=
k8s.io/component-helpers v0.30.7 h1:cue1Oq0242BPbST7TSQld/z7gqNQkAhmDVuMMhJu7Lg=
k8s.io/component-helpers v0.30.7/go.mod h1:f7aE0tdjEIaJ/DPH00kqUnhz+jQHthSUlKKlLbJqX2Q=
k8s.io/controller-manager v0.30.7 h1:4Jo6HDjC2bsY4P8NWxEd40tVZDFnTNk1v1HcmcrejwI=
k8s.io/controller-manager v0.30.7/go.mod h1:pJXE3qdo2wO9C505kkk5T8ra0ZzcxIeZX9pwLnCGqDA=
k8s.io/csi-translation-lib v0.30.7 h1:KcFUA7p/FzKF1zgOR7B4Z7L4PB7/zSXjpA5RSwMtyts=
k8s.io/csi-translation-lib v0.30.7/go.mod h1:4Knq/JueaCzJEEOPj8VCP1nlJEseps8CVVscYuhpRF4=
k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
k8s.io/kms v0.30.5 h1:hv7tnGDrxbgpedBhBfGhSu9+v5aW5uhG6w36fBIK1K8=
k8s.io/kms v0.30.5/go.mod h1:GrMurD0qk3G4yNgGcsCEmepqf9KyyIrTXYR2lyUOJC4=
k8s.io/kms v0.30.7 h1:uxqXTHzgpPkr8RSb6zB0NrYOeXfdt5yHyQdFkRNGdz4=
k8s.io/kms v0.30.7/go.mod h1:GrMurD0qk3G4yNgGcsCEmepqf9KyyIrTXYR2lyUOJC4=
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
k8s.io/kubectl v0.30.5 h1:UHIdbLWHjL/+CaFc9ZESwpwdvpp9EDPLdgGolhMv8tQ=
k8s.io/kubectl v0.30.5/go.mod h1:Pr+NYcX5Lx8eG04B/0t1rzjWcXsvvbda8swiZV9plQw=
k8s.io/kubelet v0.30.5 h1:7jsJo1MkmGC3VEE0cf1tHiFKzi8DMBVNih3/OttSBaw=
k8s.io/kubelet v0.30.5/go.mod h1:vzllyQKrbFpTq0WOHV6yX0gUs6KqTwCBAO13cAearMc=
k8s.io/kubernetes v1.30.5 h1:uay5j9vFQnjuXRfooZ+wPzbDHPHLk4nRGKYr6tq+QvQ=
k8s.io/kubernetes v1.30.5/go.mod h1:eWEwBuUIgunE32nhS0xM5hiN4BIp3ISrAIlGTyNN2JY=
k8s.io/mount-utils v0.30.5 h1:kUdMKbpUCVRN4wdgusilsmhSIGQ8NHN4df7zPnGkDQU=
k8s.io/mount-utils v0.30.5/go.mod h1:9sCVmwGLcV1MPvbZ+rToMDnl1QcGozy+jBPd0MsQLIo=
k8s.io/pod-security-admission v0.30.5 h1:sWjllF8DW7vXMggUlbROT/U9zHvQcLl3K4EC0iHBSzw=
k8s.io/pod-security-admission v0.30.5/go.mod h1:6CRS3o8HZjJX18PGS1JUY8pUtqk5nIdUuBmty0tpdEQ=
k8s.io/kubectl v0.30.7 h1:K9T8RufI5mKZmX5yITFzAT5I0fx9uheSVtR9OdbmIk4=
k8s.io/kubectl v0.30.7/go.mod h1:VdeIJnZTTkudzbMxkM25Us1MmeLeqhl+Eekt66eg7Ik=
k8s.io/kubelet v0.30.7 h1:SzAV1ehSnW3sTqeUW22Pg4HaRObv7tJ9TI7IHJhVAkk=
k8s.io/kubelet v0.30.7/go.mod h1:TX6TeST2u9xrika8RL8wPG/D8x/ZTz0wT7KrHLIZxIc=
k8s.io/kubernetes v1.30.7 h1:02tPr+FPLzY0J+a14SRBIxSMaTkdmkKNHYibrRtwPVQ=
k8s.io/kubernetes v1.30.7/go.mod h1:hV3c+sqOEO0eVqgSo0KW5dOJ6UjGJ2l3Pd9+Qvft8UI=
k8s.io/mount-utils v0.30.7 h1:yEGuwaYRAO2ylepooPL7D1h0SOd7Nizhgutm/HIjNMs=
k8s.io/mount-utils v0.30.7/go.mod h1:9sCVmwGLcV1MPvbZ+rToMDnl1QcGozy+jBPd0MsQLIo=
k8s.io/pod-security-admission v0.30.7 h1:giVLC0KIl1bigM1zkA6Pn8mhuIFz1vaZHgbH3RnSm6s=
k8s.io/pod-security-admission v0.30.7/go.mod h1:gAwUeQm5MAdI3vi23kkBXk+H1wUGYfjiTq/CX2enMPc=
k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
Expand Down
2 changes: 1 addition & 1 deletion manifests/barbican-kms/ds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:
serviceAccountName: cloud-controller-manager
containers:
- name: barbican-kms
image: registry.k8s.io/provider-os/barbican-kms-plugin:v1.30.1
image: registry.k8s.io/provider-os/barbican-kms-plugin:v1.30.2
args:
- /bin/barbican-kms-plugin
- --socketpath=$(KMS_ENDPOINT)
Expand Down
2 changes: 1 addition & 1 deletion manifests/barbican-kms/pod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
spec:
containers:
- name: barbican-kms
image: registry.k8s.io/provider-os/barbican-kms-plugin:v1.30.1
image: registry.k8s.io/provider-os/barbican-kms-plugin:v1.30.2
args:
- "--socketpath=/kms/kms.sock"
- "--cloud-config=/etc/kubernetes/cloud-config"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ spec:
- mountPath: /var/lib/csi/sockets/pluginproxy/
name: socket-dir
- name: cinder-csi-plugin
image: registry.k8s.io/provider-os/cinder-csi-plugin:v1.30.1
image: registry.k8s.io/provider-os/cinder-csi-plugin:v1.30.2
args:
- /bin/cinder-csi-plugin
- "--endpoint=$(CSI_ENDPOINT)"
Expand Down
2 changes: 1 addition & 1 deletion manifests/cinder-csi-plugin/cinder-csi-nodeplugin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ spec:
capabilities:
add: ["SYS_ADMIN"]
allowPrivilegeEscalation: true
image: registry.k8s.io/provider-os/cinder-csi-plugin:v1.30.1
image: registry.k8s.io/provider-os/cinder-csi-plugin:v1.30.2
args:
- /bin/cinder-csi-plugin
- "--endpoint=$(CSI_ENDPOINT)"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ spec:
serviceAccountName: cloud-controller-manager
containers:
- name: openstack-cloud-controller-manager
image: registry.k8s.io/provider-os/openstack-cloud-controller-manager:v1.30.1
image: registry.k8s.io/provider-os/openstack-cloud-controller-manager:v1.30.2
args:
- /bin/openstack-cloud-controller-manager
- --v=1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
spec:
containers:
- name: openstack-cloud-controller-manager
image: registry.k8s.io/provider-os/openstack-cloud-controller-manager:v1.30.1
image: registry.k8s.io/provider-os/openstack-cloud-controller-manager:v1.30.2
args:
- /bin/openstack-cloud-controller-manager
- --v=1
Expand Down
2 changes: 1 addition & 1 deletion manifests/magnum-auto-healer/magnum-auto-healer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ spec:
node-role.kubernetes.io/control-plane: ""
containers:
- name: magnum-auto-healer
image: registry.k8s.io/provider-os/magnum-auto-healer:v1.30.1
image: registry.k8s.io/provider-os/magnum-auto-healer:v1.30.2
imagePullPolicy: Always
args:
- /bin/magnum-auto-healer
Expand Down
2 changes: 1 addition & 1 deletion manifests/manila-csi-plugin/csi-controllerplugin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ spec:
capabilities:
add: ["SYS_ADMIN"]
allowPrivilegeEscalation: true
image: registry.k8s.io/provider-os/manila-csi-plugin:v1.30.1
image: registry.k8s.io/provider-os/manila-csi-plugin:v1.30.2
command: ["/bin/sh", "-c",
'/bin/manila-csi-plugin
--nodeid=$(NODE_ID)
Expand Down
2 changes: 1 addition & 1 deletion manifests/manila-csi-plugin/csi-nodeplugin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ spec:
capabilities:
add: ["SYS_ADMIN"]
allowPrivilegeEscalation: true
image: registry.k8s.io/provider-os/manila-csi-plugin:v1.30.1
image: registry.k8s.io/provider-os/manila-csi-plugin:v1.30.2
command: ["/bin/sh", "-c",
'/bin/manila-csi-plugin
--nodeid=$(NODE_ID)
Expand Down
19 changes: 17 additions & 2 deletions tests/playbooks/roles/install-csi-cinder/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@
cmd: |
kubectl -n kube-system get secret cloud-config >/dev/null 2>&1
if [ $? -eq 0 ]; then
exit 0
kubectl -n kube-system get secrets cloud-config -o json | jq -r '.data."cloud.conf"' | base64 -d
# replacing a cloud-config, created by the OCCM role
kubectl -n kube-system delete secret cloud-config
fi
set -ex
Expand All @@ -43,9 +45,12 @@
tenant-id=$tenant_id
domain-id=default
[LoadBalancer]
enabled=false
EOF
kubectl create secret -n kube-system generic cloud-config --from-file={{ ansible_user_dir }}/cloud.conf
kubectl -n kube-system get secrets cloud-config -o json | jq -r '.data."cloud.conf"' | base64 -d
- name: Replace manifests
shell:
Expand Down Expand Up @@ -139,11 +144,21 @@
set -x
set -e
mkdir -p /var/log/csi-pod
kubectl logs deployment/csi-cinder-controllerplugin -n kube-system -c cinder-csi-plugin
kubectl logs daemonset/csi-cinder-nodeplugin -n kube-system -c cinder-csi-plugin
kubectl logs deployment/csi-cinder-controllerplugin -n kube-system -c cinder-csi-plugin > /var/log/csi-pod/csi-cinder-controllerplugin.log
kubectl logs daemonset/csi-cinder-nodeplugin -n kube-system -c cinder-csi-plugin > /var/log/csi-pod/csi-cinder-nodeplugin.log
kubectl logs daemonset/csi-cinder-nodeplugin -n kube-system -c cinder-csi-plugin > /var/log/csi-pod/csi-cinder-nodeplugin.log
- name: Show openstack-cloud-controller-manager pod logs
shell:
executable: /bin/bash
cmd: |
kubectl -n kube-system logs ds/openstack-cloud-controller-manager
kubectl -n kube-system logs ds/openstack-cloud-controller-manager > /var/log/csi-pod/occm.log
- name: &failmsg Stop due to prior failure of csi-cinder-plugin
fail:
msg: *failmsg
Expand Down
Loading

0 comments on commit 3433634

Please sign in to comment.