Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make necessary changes for release-v3.8.1 #4005

Merged
merged 3 commits into from
Jul 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion build.env
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@
# get proporly expanded.
#
# cephcsi image version
CSI_IMAGE_VERSION=v3.8-canary
CSI_IMAGE_VERSION=v3.8.1

# cephcsi upgrade version
CSI_UPGRADE_VERSION=v3.7.2

# Ceph version to use
BASE_IMAGE=quay.io/ceph/ceph:v17
Expand Down
2 changes: 1 addition & 1 deletion charts/ceph-csi-cephfs/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ nodeplugin:
plugin:
image:
repository: quay.io/cephcsi/cephcsi
tag: v3.8-canary
tag: v3.8.1
pullPolicy: IfNotPresent
resources: {}

Expand Down
2 changes: 1 addition & 1 deletion charts/ceph-csi-rbd/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ nodeplugin:
plugin:
image:
repository: quay.io/cephcsi/cephcsi
tag: v3.8-canary
tag: v3.8.1
pullPolicy: IfNotPresent
resources: {}

Expand Down
4 changes: 2 additions & 2 deletions deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ spec:
mountPath: /csi
- name: csi-cephfsplugin
# for stable functionality replace canary with latest release version
image: quay.io/cephcsi/cephcsi:v3.8-canary
image: quay.io/cephcsi/cephcsi:v3.8.1
args:
- "--nodeid=$(NODE_ID)"
- "--type=cephfs"
Expand Down Expand Up @@ -143,7 +143,7 @@ spec:
- name: ceph-csi-encryption-kms-config
mountPath: /etc/ceph-csi-encryption-kms-config/
- name: liveness-prometheus
image: quay.io/cephcsi/cephcsi:v3.8-canary
image: quay.io/cephcsi/cephcsi:v3.8.1
args:
- "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)"
Expand Down
4 changes: 2 additions & 2 deletions deploy/cephfs/kubernetes/csi-cephfsplugin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ spec:
add: ["SYS_ADMIN"]
allowPrivilegeEscalation: true
# for stable functionality replace canary with latest release version
image: quay.io/cephcsi/cephcsi:v3.8-canary
image: quay.io/cephcsi/cephcsi:v3.8.1
args:
- "--nodeid=$(NODE_ID)"
- "--type=cephfs"
Expand Down Expand Up @@ -116,7 +116,7 @@ spec:
securityContext:
privileged: true
allowPrivilegeEscalation: true
image: quay.io/cephcsi/cephcsi:v3.8-canary
image: quay.io/cephcsi/cephcsi:v3.8.1
args:
- "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)"
Expand Down
4 changes: 2 additions & 2 deletions deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ spec:
mountPath: /csi
- name: csi-nfsplugin
# for stable functionality replace canary with latest release version
image: quay.io/cephcsi/cephcsi:v3.8-canary
image: quay.io/cephcsi/cephcsi:v3.8.1
args:
- "--nodeid=$(NODE_ID)"
- "--type=nfs"
Expand Down Expand Up @@ -120,7 +120,7 @@ spec:
- name: keys-tmp-dir
mountPath: /tmp/csi/keys
- name: liveness-prometheus
image: quay.io/cephcsi/cephcsi:v3.8-canary
image: quay.io/cephcsi/cephcsi:v3.8.1
args:
- "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)"
Expand Down
2 changes: 1 addition & 1 deletion deploy/nfs/kubernetes/csi-nfsplugin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ spec:
add: ["SYS_ADMIN"]
allowPrivilegeEscalation: true
# for stable functionality replace canary with latest release version
image: quay.io/cephcsi/cephcsi:v3.8-canary
image: quay.io/cephcsi/cephcsi:v3.8.1
args:
- "--nodeid=$(NODE_ID)"
- "--type=nfs"
Expand Down
6 changes: 3 additions & 3 deletions deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ spec:
mountPath: /csi
- name: csi-rbdplugin
# for stable functionality replace canary with latest release version
image: quay.io/cephcsi/cephcsi:v3.8-canary
image: quay.io/cephcsi/cephcsi:v3.8.1
args:
- "--nodeid=$(NODE_ID)"
- "--type=rbd"
Expand Down Expand Up @@ -174,7 +174,7 @@ spec:
readOnly: true
- name: csi-rbdplugin-controller
# for stable functionality replace canary with latest release version
image: quay.io/cephcsi/cephcsi:v3.8-canary
image: quay.io/cephcsi/cephcsi:v3.8.1
args:
- "--type=controller"
- "--v=5"
Expand All @@ -195,7 +195,7 @@ spec:
- name: ceph-config
mountPath: /etc/ceph/
- name: liveness-prometheus
image: quay.io/cephcsi/cephcsi:v3.8-canary
image: quay.io/cephcsi/cephcsi:v3.8.1
args:
- "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)"
Expand Down
4 changes: 2 additions & 2 deletions deploy/rbd/kubernetes/csi-rbdplugin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ spec:
add: ["SYS_ADMIN"]
allowPrivilegeEscalation: true
# for stable functionality replace canary with latest release version
image: quay.io/cephcsi/cephcsi:v3.8-canary
image: quay.io/cephcsi/cephcsi:v3.8.1
args:
- "--nodeid=$(NODE_ID)"
- "--pluginpath=/var/lib/kubelet/plugins"
Expand Down Expand Up @@ -135,7 +135,7 @@ spec:
securityContext:
privileged: true
allowPrivilegeEscalation: true
image: quay.io/cephcsi/cephcsi:v3.8-canary
image: quay.io/cephcsi/cephcsi:v3.8.1
args:
- "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)"
Expand Down
4 changes: 2 additions & 2 deletions docs/ceph-csi-upgrade.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,12 @@ compatibility support and without prior notice.
**Also, we do not recommend any direct upgrades to 3.8 except from 3.7 to 3.8.**
For example, upgrading from 3.6 to 3.8 is not recommended.

git checkout v3.8.0 tag
git checkout v3.8.1 tag

```bash
git clone https://github.com/ceph/ceph-csi.git
cd ./ceph-csi
git checkout v3.8.0
git checkout v3.8.1
```

```console
Expand Down