Skip to content
This repository has been archived by the owner on Oct 23, 2024. It is now read-only.

bump cassandra to 3.11.6 #116

Merged
merged 6 commits into from
May 28, 2020
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ and this project adheres to

- Bumped Cassandra Prometheus Exporter to 2.3.4.
([#56](https://github.com/mesosphere/kudo-cassandra-operator/pull/56))
- Bumped Cassandra to 3.11.6.
([#116](https://github.com/mesosphere/kudo-cassandra-operator/pull/116))

### Added

Expand Down
2 changes: 1 addition & 1 deletion docs/accessing.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ echo ${cassandra_image}
Example output:

```
mesosphere/cassandra:3.11.5-0.1.2
mesosphere/cassandra:3.11.6-0.1.2
```

#### 4. Run a command which accesses cassandra in a pod
Expand Down
2 changes: 1 addition & 1 deletion docs/parameters.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
| **NODE_MEM_LIMIT_MIB** | Memory limit (in MiB) for the Cassandra node containers. | 4096 |
| **NODE_DISK_SIZE_GIB** | Disk size (in GiB) for the Cassandra node containers. | 20 |
| **NODE_STORAGE_CLASS** | The storage class to be used in volumeClaimTemplates. By default, it is not required and the default storage class is used. | |
| **NODE_DOCKER_IMAGE** | Cassandra node Docker image. | mesosphere/cassandra:3.11.5-0.1.2-SNAPSHOT |
| **NODE_DOCKER_IMAGE** | Cassandra node Docker image. | mesosphere/cassandra:3.11.6-0.1.2-SNAPSHOT |
| **NODE_DOCKER_IMAGE_PULL_POLICY** | Cassandra node Docker image pull policy. | Always |
| **NODE_READINESS_PROBE_INITIAL_DELAY_S** | Number of seconds after the container has started before the readiness probe is initiated. | 0 |
| **NODE_READINESS_PROBE_PERIOD_S** | How often (in seconds) to perform the readiness probe. | 5 |
Expand Down
6 changes: 4 additions & 2 deletions images/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@ RUN apt-get update && apt-get install ca-certificates
ENV GO111MODULE=on
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o bootstrap

FROM cassandra:3.11.5
FROM cassandra:3.11.6

RUN set -eux; \
rm /etc/apt/sources.list.d/cassandra.list; \
apt-get update; \
apt-get install -y --no-install-recommends libcap2-bin; \
echo "/opt/java/openjdk/lib/amd64/" >> /etc/ld.so.conf.d/java.conf; \
echo "/opt/java/openjdk/lib/amd64/jli" >> /etc/ld.so.conf.d/java.conf; \
ldconfig; \
# Setting this capability will cause running the Java binary to not be
# "recognized" when the Cassandra binary is run in a container without
# IPC_LOCK capabilities, showing a message like "Cassandra 3.0 and later
Expand Down
2 changes: 1 addition & 1 deletion images/Dockerfile.medusa-backup
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM cassandra:3.11.5
FROM cassandra:3.11.6

COPY medusa/cassandra-sudoer /etc/sudoers.d/

Expand Down
2 changes: 1 addition & 1 deletion images/Dockerfile.medusa-backup-fromsrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM cassandra:3.11.5
FROM cassandra:3.11.6

COPY medusa/cassandra-sudoer /etc/sudoers.d/

Expand Down
4 changes: 2 additions & 2 deletions metadata.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ export VENDOR_DIRECTORY="${_project_directory}/shared/vendor"
############################### Dependencies ###################################
################################################################################

# http://www.apache.org/dyn/closer.lua/cassandra/3.11.5
# http://www.apache.org/dyn/closer.lua/cassandra/3.11.6
# https://hub.docker.com/_/cassandra
# https://github.com/docker-library/cassandra/blob/master/3.11/Dockerfile
export CASSANDRA_VERSION="3.11.5"
export CASSANDRA_VERSION="3.11.6"

# https://github.com/kudobuilder/kudo/releases/tag/vx.y.z
export KUDO_VERSION="0.11.1"
Expand Down
2 changes: 1 addition & 1 deletion operator/operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: "cassandra"
operatorVersion: "0.1.2"
kudoVersion: "0.11.1"
kubernetesVersion: "1.15.0"
appVersion: "3.11.5"
appVersion: "3.11.6"
maintainers:
- name: Murilo Pereira
email: [email protected]
Expand Down
2 changes: 1 addition & 1 deletion operator/params.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ parameters:

- name: NODE_DOCKER_IMAGE
description: "Cassandra node Docker image."
default: "mesosphere/cassandra:3.11.5-0.1.2-SNAPSHOT"
default: "mesosphere/cassandra:3.11.6-0.1.2-SNAPSHOT"

- name: NODE_DOCKER_IMAGE_PULL_POLICY
description: "Cassandra node Docker image pull policy."
Expand Down
4 changes: 3 additions & 1 deletion templates/images/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o bootstrap
FROM ${CASSANDRA_DOCKER_IMAGE_FROM}

RUN set -eux; \
rm /etc/apt/sources.list.d/cassandra.list; \
apt-get update; \
apt-get install -y --no-install-recommends libcap2-bin; \
echo "/opt/java/openjdk/lib/amd64/" >> /etc/ld.so.conf.d/java.conf; \
echo "/opt/java/openjdk/lib/amd64/jli" >> /etc/ld.so.conf.d/java.conf; \
ldconfig; \
# Setting this capability will cause running the Java binary to not be
# "recognized" when the Cassandra binary is run in a container without
# IPC_LOCK capabilities, showing a message like "Cassandra 3.0 and later
Expand Down