diff --git a/CHANGELOG.md b/CHANGELOG.md index ddbb48cdd..3087ec408 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,11 @@ 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](https://github.com/cockroachdb/cockroach-operator/compare/v2.17.0...master) +# [Unreleased](https://github.com/cockroachdb/cockroach-operator/compare/v2.18.0...master) + +# [v2.18.0](https://github.com/cockroachdb/cockroach-operator/compare/v2.17.0...v2.18.0) +* Added support for skipping innovative releases post 24.x +* Added support for QoS on init containers. # [v2.17.0](https://github.com/cockroachdb/cockroach-operator/compare/v2.16.1...v2.17.0) * Added support for linux/arm64 images. diff --git a/config/manager/patches/image.yaml b/config/manager/patches/image.yaml index 3a70a70b4..df490065c 100644 --- a/config/manager/patches/image.yaml +++ b/config/manager/patches/image.yaml @@ -24,7 +24,7 @@ spec: spec: containers: - name: cockroach-operator - image: cockroachdb/cockroach-operator:v2.17.0 + image: cockroachdb/cockroach-operator:v2.18.0 env: - name: RELATED_IMAGE_COCKROACH_v21_1_0 value: cockroachdb/cockroach:v21.1.0 diff --git a/install/operator.yaml b/install/operator.yaml index b523cbf84..cebec009e 100644 --- a/install/operator.yaml +++ b/install/operator.yaml @@ -711,7 +711,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: cockroachdb/cockroach-operator:v2.17.0 + image: cockroachdb/cockroach-operator:v2.18.0 imagePullPolicy: IfNotPresent name: cockroach-operator resources: diff --git a/version.txt b/version.txt index 6618ab545..5b8407389 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.17.0 \ No newline at end of file +2.18.0 \ No newline at end of file