From 23705b43a7b6808a0dd38031a3e82d84f0de32af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20Wanzenb=C3=B6ck?= Date: Tue, 30 Jan 2024 15:17:31 +0100 Subject: [PATCH 1/4] image updates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Moritz Wanzenböck --- CHANGELOG.md | 2 ++ charts/piraeus/templates/config.yaml | 20 +++++++++---------- .../manager/0_piraeus_datastore_images.yaml | 6 +++--- config/manager/0_sig_storage_images.yaml | 14 ++++++------- 4 files changed, 22 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 929a83ec..1afa02b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Change default monitoring address for DRBD Reactor to support systems with IPv6 completely disabled. - Updated images: + * LINSTOR 1.26.1 + * LINSTOR CSI 1.4.0 * DRBD 9.2.7 * High Availability Controller 1.2.0 * Latest CSI sidecars diff --git a/charts/piraeus/templates/config.yaml b/charts/piraeus/templates/config.yaml index 786c535b..e314a56c 100644 --- a/charts/piraeus/templates/config.yaml +++ b/charts/piraeus/templates/config.yaml @@ -17,13 +17,13 @@ data: # quay.io/piraeusdatastore/piraeus-server:v1.24.2 components: linstor-controller: - tag: v1.25.1 + tag: v1.26.1 image: piraeus-server linstor-satellite: - tag: v1.25.1 + tag: v1.26.1 image: piraeus-server linstor-csi: - tag: v1.3.0 + tag: v1.4.0 image: piraeus-csi drbd-reactor: tag: v1.4.0 @@ -69,25 +69,25 @@ data: base: registry.k8s.io/sig-storage components: csi-attacher: - tag: v4.4.3 + tag: v4.5.0 image: csi-attacher csi-livenessprobe: - tag: v2.11.0 + tag: v2.12.0 image: livenessprobe csi-provisioner: - tag: v3.6.3 + tag: v4.0.0 image: csi-provisioner csi-snapshotter: - tag: v6.3.3 + tag: v7.0.1 image: csi-snapshotter csi-resizer: - tag: v1.9.3 + tag: v1.10.0 image: csi-resizer csi-external-health-monitor-controller: - tag: v0.10.0 + tag: v0.11.0 image: csi-external-health-monitor-controller csi-node-driver-registrar: - tag: v2.9.3 + tag: v2.10.0 image: csi-node-driver-registrar {{- range $idx, $value := .Values.imageConfigOverride }} {{ add $idx 1 }}_helm_override.yaml: | diff --git a/config/manager/0_piraeus_datastore_images.yaml b/config/manager/0_piraeus_datastore_images.yaml index 0c7f68b0..aad9cf38 100644 --- a/config/manager/0_piraeus_datastore_images.yaml +++ b/config/manager/0_piraeus_datastore_images.yaml @@ -8,13 +8,13 @@ base: quay.io/piraeusdatastore # quay.io/piraeusdatastore/piraeus-server:v1.24.2 components: linstor-controller: - tag: v1.25.1 + tag: v1.26.1 image: piraeus-server linstor-satellite: - tag: v1.25.1 + tag: v1.26.1 image: piraeus-server linstor-csi: - tag: v1.3.0 + tag: v1.4.0 image: piraeus-csi drbd-reactor: tag: v1.4.0 diff --git a/config/manager/0_sig_storage_images.yaml b/config/manager/0_sig_storage_images.yaml index afa92dea..468c1d1a 100644 --- a/config/manager/0_sig_storage_images.yaml +++ b/config/manager/0_sig_storage_images.yaml @@ -2,23 +2,23 @@ base: registry.k8s.io/sig-storage components: csi-attacher: - tag: v4.4.3 + tag: v4.5.0 image: csi-attacher csi-livenessprobe: - tag: v2.11.0 + tag: v2.12.0 image: livenessprobe csi-provisioner: - tag: v3.6.3 + tag: v4.0.0 image: csi-provisioner csi-snapshotter: - tag: v6.3.3 + tag: v7.0.1 image: csi-snapshotter csi-resizer: - tag: v1.9.3 + tag: v1.10.0 image: csi-resizer csi-external-health-monitor-controller: - tag: v0.10.0 + tag: v0.11.0 image: csi-external-health-monitor-controller csi-node-driver-registrar: - tag: v2.9.3 + tag: v2.10.0 image: csi-node-driver-registrar From 397f84a206ee507e9a58c22ca967f522089d8f0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20Wanzenb=C3=B6ck?= Date: Tue, 30 Jan 2024 15:23:00 +0100 Subject: [PATCH 2/4] add upgrade docs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Moritz Wanzenböck --- UPGRADE.md | 37 +++++++++++++++++++++++++++++++++++++ hack/make-release.sh | 2 +- 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/UPGRADE.md b/UPGRADE.md index a724ea36..11a9ccce 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -3,6 +3,43 @@ During the upgrade process, provisioning of volumes and attach/detach operations might not work. Existing volumes and volumes already in use by a pod will continue to work without interruption. +To upgrade, apply the resource of the latest release. Use the same method that was used to create the initial deployment +(`kubectl` vs `helm`). There is no need to change existing `LinstorCluster`, `LinstorSatelliteConfiguration` or +`LinstorNodeConnection` resources. + +To upgrade to the latest release using `kubectl`, run the following commands: + +``` +$ kubectl apply --server-side -k "https://github.com/piraeusdatastore/piraeus-operator//config/default?ref=v2.3.0" +$ kubectl wait pod --for=condition=Ready -n piraeus-datastore --all +``` + +# Upgrades from v2.3 to v2.4 + +Generally, no special steps required. + +LINSTOR Satellites are now managed via DaemonSet resources. Any patch targeting a `satellite` Pod resources is +automatically converted to the equivalent DaemonSet resource patch. In the Pod list, you will see these Pods using +a new `linstor-satellite` prefix. + +# Upgrades from v2.2 to v2.3 + +Removed the `NetworkPolicy` resource from default deployment. It can be reapplied as a +[separate step](./docs/how-to/network-policy.md). + +# Upgrades from v2.1 to v2.2 + +Removed the dependency on cert-manager for the initial deployment. To clean up an existing `Certificate` resource, +run the following commands: + +``` +$ kubectl delete certificate -n piraeus-datastore piraeus-operator-serving-cert +``` + +# Upgrades from v2.0 to v2.1 + +No special steps required. + # Upgrades from v1 to v2 Please follow the specialized [upgrade guides](./docs/how-to/upgrade/index.md). diff --git a/hack/make-release.sh b/hack/make-release.sh index d5e200d3..bcd8fedd 100755 --- a/hack/make-release.sh +++ b/hack/make-release.sh @@ -40,7 +40,7 @@ $KUSTOMIZE edit set image controller="$IMG:v$VERSION" popd # replace deployment instructions in docs -for FILE in ./README.md ./docs/tutorial/get-started.md ; do +for FILE in ./README.md ./docs/tutorial/get-started.md ./UPGRADE.md ; do sed -e "s/ref=v[0-9\.]\+/ref=v$VERSION/" -i "$FILE" done From 7aeecc8fdccc4fc54b7f097b692e986dc4de0d48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20Wanzenb=C3=B6ck?= Date: Tue, 30 Jan 2024 15:26:32 +0100 Subject: [PATCH 3/4] Release v2.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Moritz Wanzenböck --- CHANGELOG.md | 4 ++-- Makefile | 2 +- README.md | 2 +- UPGRADE.md | 2 +- charts/piraeus/Chart.yaml | 4 ++-- config/default/kustomization.yaml | 2 +- docs/tutorial/get-started.md | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1afa02b2..1d5db644 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased] +## [v2.4.0] - 2024-01-30 ### Added @@ -802,4 +802,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [v2.1.1]: https://github.com/piraeusdatastore/piraeus-operator/compare/v2.1.0...v2.1.1 [v2.2.0]: https://github.com/piraeusdatastore/piraeus-operator/compare/v2.1.1...v2.2.0 [v2.3.0]: https://github.com/piraeusdatastore/piraeus-operator/compare/v2.2.0...v2.3.0 -[Unreleased]: https://github.com/piraeusdatastore/piraeus-operator/compare/v2.3.0...HEAD +[v2.4.0]: https://github.com/piraeusdatastore/piraeus-operator/compare/v2.3.0...v2.4.0 diff --git a/Makefile b/Makefile index 08f341a3..ed456831 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ PROJECT_NAME ?= piraeus-operator # To re-generate a bundle for another specific version without changing the standard setup, you can: # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2) # - use environment variables to overwrite this value (e.g export VERSION=0.0.2) -VERSION ?= 2.3.0 +VERSION ?= 2.4.0 # CHANNELS define the bundle channels used in the bundle. # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable") diff --git a/README.md b/README.md index 33776683..2c099bd3 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ to fix issues or new software versions until a stable upgrade path to v2 is avai To deploy Piraeus Operator v2 from this repository, simply run: ``` -$ kubectl apply --server-side -k "https://github.com/piraeusdatastore/piraeus-operator//config/default?ref=v2.3.0" +$ kubectl apply --server-side -k "https://github.com/piraeusdatastore/piraeus-operator//config/default?ref=v2.4.0" # Verify the operator is running: $ kubectl wait pod --for=condition=Ready -n piraeus-datastore -l app.kubernetes.io/component=piraeus-operator pod/piraeus-operator-controller-manager-dd898f48c-bhbtv condition met diff --git a/UPGRADE.md b/UPGRADE.md index 11a9ccce..94f49ef4 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -10,7 +10,7 @@ To upgrade, apply the resource of the latest release. Use the same method that w To upgrade to the latest release using `kubectl`, run the following commands: ``` -$ kubectl apply --server-side -k "https://github.com/piraeusdatastore/piraeus-operator//config/default?ref=v2.3.0" +$ kubectl apply --server-side -k "https://github.com/piraeusdatastore/piraeus-operator//config/default?ref=v2.4.0" $ kubectl wait pod --for=condition=Ready -n piraeus-datastore --all ``` diff --git a/charts/piraeus/Chart.yaml b/charts/piraeus/Chart.yaml index 2afc4450..2415ed4a 100644 --- a/charts/piraeus/Chart.yaml +++ b/charts/piraeus/Chart.yaml @@ -3,8 +3,8 @@ name: piraeus description: | The Piraeus Operator manages software defined storage clusters using LINSTOR in Kubernetes. type: application -version: 2.3.0 -appVersion: "v2.3.0" +version: 2.4.0 +appVersion: "v2.4.0" maintainers: - name: Piraeus Datastore url: https://piraeus.io diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index 5718f5cd..696a139c 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -12,7 +12,7 @@ labels: images: - name: controller newName: quay.io/piraeusdatastore/piraeus-operator - newTag: v2 + newTag: v2.4.0 # [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'. #- ../prometheus diff --git a/docs/tutorial/get-started.md b/docs/tutorial/get-started.md index 96b5e640..ebcbdaf9 100644 --- a/docs/tutorial/get-started.md +++ b/docs/tutorial/get-started.md @@ -15,7 +15,7 @@ All resources needed to run Piraeus Operator are included in a single Kustomizat Install Piraeus Operator by running: ```bash -$ kubectl apply --server-side -k "https://github.com/piraeusdatastore/piraeus-operator//config/default?ref=v2.3.0" +$ kubectl apply --server-side -k "https://github.com/piraeusdatastore/piraeus-operator//config/default?ref=v2.4.0" namespace/piraeus-datastore configured ... ``` From 9f3771c9a8db0aa70bdc416b5f31ba96d7623775 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20Wanzenb=C3=B6ck?= Date: Tue, 30 Jan 2024 15:30:13 +0100 Subject: [PATCH 4/4] Prepare next dev cycle MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Moritz Wanzenböck --- CHANGELOG.md | 3 +++ config/default/kustomization.yaml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d5db644..ee8375b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [Unreleased] + ## [v2.4.0] - 2024-01-30 ### Added @@ -803,3 +805,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [v2.2.0]: https://github.com/piraeusdatastore/piraeus-operator/compare/v2.1.1...v2.2.0 [v2.3.0]: https://github.com/piraeusdatastore/piraeus-operator/compare/v2.2.0...v2.3.0 [v2.4.0]: https://github.com/piraeusdatastore/piraeus-operator/compare/v2.3.0...v2.4.0 +[Unreleased]: https://github.com/piraeusdatastore/piraeus-operator/compare/v2.4.0...HEAD diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index 696a139c..5718f5cd 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -12,7 +12,7 @@ labels: images: - name: controller newName: quay.io/piraeusdatastore/piraeus-operator - newTag: v2.4.0 + newTag: v2 # [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'. #- ../prometheus