Skip to content

Commit

Permalink
Update tags and vendor for 1.25 (#2275)
Browse files Browse the repository at this point in the history
* update tags

* update vendor
  • Loading branch information
zetaab authored Jun 14, 2023
1 parent 7734481 commit e951ec3
Show file tree
Hide file tree
Showing 20 changed files with 118 additions and 110 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.25.5
appVersion: v1.25.6
description: Cinder CSI Chart for OpenStack
name: openstack-cinder-csi
version: 2.25.0
version: 2.25.1
home: https:/kubernetes/cloud-provider-openstack
icon: https:/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.25.5
appVersion: v1.25.6
description: Manila CSI Chart for OpenStack
name: openstack-manila-csi
version: 2.25.0
version: 2.25.1
home: http:/kubernetes/cloud-provider-openstack
icon: https:/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: v1
appVersion: v1.25.5
appVersion: v1.25.6
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:/kubernetes/cloud-provider-openstack
name: openstack-cloud-controller-manager
version: 2.25.0
version: 2.25.1
maintainers:
- name: eumel8
email: [email protected]
Expand Down
2 changes: 1 addition & 1 deletion docs/barbican-kms-plugin/using-barbican-kms-plugin.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ $ docker run -d --volume=/var/lib/kms:/var/lib/kms \
--volume=/etc/kubernetes:/etc/kubernetes \
-e socketpath=/var/lib/kms/kms.sock \
-e cloudconfig=/etc/kubernetes/cloud-config \
registry.k8s.io/provider-os/barbican-kms-plugin:v1.25.5
registry.k8s.io/provider-os/barbican-kms-plugin:v1.25.6
```
6. Create /etc/kubernetes/encryption-config.yaml
```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<!-- END doctoc generated TOC please keep comment here to allow auto update -->

# k8s-keystone-auth
# k8s-keystone-auth12

[Kubernetes webhook authentication and authorization](https://kubernetes.io/docs/reference/access-authn-authz/webhook/)
for OpenStack Keystone. With k8s-keystone-auth, the Kubernetes cluster
Expand Down 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.25.5`
`registry.k8s.io/provider-os/k8s-keystone-auth:v1.25.6`
- 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.25.5
image=registry.k8s.io/provider-os/magnum-auto-healer:v1.25.6

cat <<EOF | kubectl apply -f -
---
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,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.25.5"
image="registry.k8s.io/provider-os/octavia-ingress-controller:v1.25.6"
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.25.5
image: registry.k8s.io/provider-os/k8s-keystone-auth:v1.25.6
args:
- ./bin/k8s-keystone-auth
- --tls-cert-file
Expand Down
89 changes: 45 additions & 44 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,23 @@ require (
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.12.0
github.com/stretchr/testify v1.8.0
golang.org/x/net v0.4.0
golang.org/x/sys v0.3.0
golang.org/x/term v0.3.0
golang.org/x/net v0.8.0
golang.org/x/sys v0.6.0
golang.org/x/term v0.6.0
google.golang.org/grpc v1.48.0
google.golang.org/protobuf v1.28.0
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.25.3
k8s.io/apimachinery v0.25.3
k8s.io/apiserver v0.25.3
k8s.io/client-go v0.25.3
k8s.io/cloud-provider v0.25.3
k8s.io/component-base v0.25.3
k8s.io/api v0.25.10
k8s.io/apimachinery v0.25.10
k8s.io/apiserver v0.25.10
k8s.io/client-go v0.25.10
k8s.io/cloud-provider v0.25.10
k8s.io/component-base v0.25.10
k8s.io/klog/v2 v2.70.1
k8s.io/kubernetes v1.25.3
k8s.io/mount-utils v0.25.3
k8s.io/kubernetes v1.25.10
k8s.io/mount-utils v0.25.10
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
software.sslmate.com/src/go-pkcs12 v0.0.0-20190209200317-47dd539968c4
)
Expand Down Expand Up @@ -122,8 +122,8 @@ require (
go.uber.org/zap v1.19.0 // indirect
golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 // indirect
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
golang.org/x/text v0.5.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/text v0.8.0 // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd // indirect
Expand All @@ -133,46 +133,47 @@ require (
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.0.0 // indirect
k8s.io/component-helpers v0.25.3 // indirect
k8s.io/controller-manager v0.25.3 // indirect
k8s.io/csi-translation-lib v0.25.3 // indirect
k8s.io/component-helpers v0.25.10 // indirect
k8s.io/controller-manager v0.25.10 // indirect
k8s.io/csi-translation-lib v0.25.10 // indirect
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
k8s.io/kubectl v0.0.0 // indirect
k8s.io/kubelet v0.0.0 // indirect
k8s.io/pod-security-admission v0.0.0 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.37 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
)

replace (
github.com/docker/distribution => github.com/docker/distribution v2.8.2+incompatible
google.golang.org/grpc v1.34.0 => google.golang.org/grpc v1.29.0
k8s.io/api => k8s.io/api v0.25.3
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.3
k8s.io/apimachinery => k8s.io/apimachinery v0.25.3
k8s.io/apiserver => k8s.io/apiserver v0.25.3
k8s.io/cli-runtime => k8s.io/cli-runtime v0.25.3
k8s.io/client-go => k8s.io/client-go v0.25.3
k8s.io/cloud-provider => k8s.io/cloud-provider v0.25.3
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.3
k8s.io/code-generator => k8s.io/code-generator v0.25.3
k8s.io/component-base => k8s.io/component-base v0.25.3
k8s.io/component-helpers => k8s.io/component-helpers v0.25.3
k8s.io/controller-manager => k8s.io/controller-manager v0.25.3
k8s.io/cri-api => k8s.io/cri-api v0.25.3
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.25.3
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.3
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.25.3
k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.3
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.25.3
k8s.io/kubectl => k8s.io/kubectl v0.25.3
k8s.io/kubelet => k8s.io/kubelet v0.25.3
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.25.3
k8s.io/metrics => k8s.io/metrics v0.25.3
k8s.io/mount-utils => k8s.io/mount-utils v0.25.3
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.3
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.25.3
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.25.3
k8s.io/sample-controller => k8s.io/sample-controller v0.25.3
k8s.io/api => k8s.io/api v0.25.10
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.10
k8s.io/apimachinery => k8s.io/apimachinery v0.25.10
k8s.io/apiserver => k8s.io/apiserver v0.25.10
k8s.io/cli-runtime => k8s.io/cli-runtime v0.25.10
k8s.io/client-go => k8s.io/client-go v0.25.10
k8s.io/cloud-provider => k8s.io/cloud-provider v0.25.10
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.10
k8s.io/code-generator => k8s.io/code-generator v0.25.10
k8s.io/component-base => k8s.io/component-base v0.25.10
k8s.io/component-helpers => k8s.io/component-helpers v0.25.10
k8s.io/controller-manager => k8s.io/controller-manager v0.25.10
k8s.io/cri-api => k8s.io/cri-api v0.25.10
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.25.10
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.10
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.25.10
k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.10
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.25.10
k8s.io/kubectl => k8s.io/kubectl v0.25.10
k8s.io/kubelet => k8s.io/kubelet v0.25.10
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.25.10
k8s.io/metrics => k8s.io/metrics v0.25.10
k8s.io/mount-utils => k8s.io/mount-utils v0.25.10
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.10
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.25.10
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.25.10
k8s.io/sample-controller => k8s.io/sample-controller v0.25.10
)
Loading

0 comments on commit e951ec3

Please sign in to comment.