Skip to content

Commit

Permalink
Merge branch '1.22.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
burmanm committed Sep 11, 2024
2 parents 454935b + 87b1923 commit 7e644ae
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 9 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ Changelog for Cass Operator, new PRs should update the `main / unreleased` secti
## unreleased

* [FEATURE] [#651](https://github.com/k8ssandra/cass-operator/issues/651) Add tsreload task for DSE deployments and ability to check if sync operation is available on the mgmt-api side

## v1.22.2

* [BUGFIX] [#703](https://github.com/k8ssandra/cass-operator/issues/703) Fix HCD config path from /etc/cassandra to /opt/hcd/resources/cassandra/conf

## v1.22.1
Expand Down
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ Default installation is simple, the kubectl will create a namespace ``cass-opera
Default install requires cert-manager to be installed, since webhooks require TLS certificates to be injected. See below how to install cert-manager if your environment does not have it installed previously.

```console
kubectl apply --force-conflicts --server-side -k github.com/k8ssandra/cass-operator/config/deployments/default?ref=v1.22.1
kubectl apply --force-conflicts --server-side -k github.com/k8ssandra/cass-operator/config/deployments/default?ref=v1.22.2
```

If you wish to install it with cluster wide rights to monitor all the namespaces for ``CassandraDatacenter`` objects, use the following command:

```console
kubectl apply --force-conflicts --server-side -k github.com/k8ssandra/cass-operator/config/deployments/cluster?ref=v1.22.1
kubectl apply --force-conflicts --server-side -k github.com/k8ssandra/cass-operator/config/deployments/cluster?ref=v1.22.2
```

Alternatively, if you checkout the code, you can use ``make deploy`` to run [Kustomize](https://kustomize.io/) and deploy the files.
Expand All @@ -61,7 +61,7 @@ cass-operator-555577b9f8-zgx6j 1/1 Running 0 25h
If you have Prometheus installed in your cluster, you can apply the following command to install the Prometheus support:

```console
kubectl apply -k github.com/k8ssandra/cass-operator/config/prometheus?ref=v1.22.1
kubectl apply -k github.com/k8ssandra/cass-operator/config/prometheus?ref=v1.22.2
```

#### Install cert-manager
Expand All @@ -83,10 +83,10 @@ kind: Kustomization
namespace: cass-operator

resources:
- github.com/k8ssandra/cass-operator/config/deployments/default?ref=v1.22.1
- github.com/k8ssandra/cass-operator/config/deployments/default?ref=v1.22.2

components:
- github.com/k8ssandra/cass-operator/config/components/cluster?ref=v1.22.1
- github.com/k8ssandra/cass-operator/config/components/cluster?ref=v1.22.2
```
We provide both components to modify the installation as well as some additional resources for custom features. At the moment, you can modify the behavior of the installation in the following ways, or remove a component to
Expand Down Expand Up @@ -121,7 +121,7 @@ kind: ImageConfig
metadata:
name: image-config
images:
system-logger: "k8ssandra/system-logger:v1.22.1"
system-logger: "k8ssandra/system-logger:v1.22.2"
config-builder: "datastax/cass-config-builder:1.0-ubi7"
imageRegistry: "localhost:5000"
defaults:
Expand Down Expand Up @@ -152,7 +152,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

resources:
- github.com/k8ssandra/cass-operator/config/deployments/default?ref=v1.22.1
- github.com/k8ssandra/cass-operator/config/deployments/default?ref=v1.22.2

components:
- components/private_image_config
Expand All @@ -164,7 +164,7 @@ If you also wish to load the cass-operator from a different path, you will need
images:
- name: controller
newName: localhost:5000/k8ssandra/cass-operator
newTag: v1.22.1
newTag: v1.22.2
```
Run ``kubectl apply -k our_installation`` to install cass-operator.
Expand Down Expand Up @@ -253,7 +253,7 @@ reclaimPolicy: Delete
Paste the above to a file and apply:
```
kubectl apply -f https://raw.githubusercontent.com/k8ssandra/cass-operator/v1.22.1/operator/k8s-flavors/gke/storage.yaml
kubectl apply -f https://raw.githubusercontent.com/k8ssandra/cass-operator/v1.22.2/operator/k8s-flavors/gke/storage.yaml
```

### Creating a CassandraDatacenter
Expand Down

0 comments on commit 7e644ae

Please sign in to comment.