From 2fef1750d8224b164ed23d4475347c6e01b3f008 Mon Sep 17 00:00:00 2001 From: Jan Schlicht Date: Tue, 21 Jul 2020 12:47:21 +0200 Subject: [PATCH 1/3] Fix warnings when running 'kubectl kudo package verify' The unused 'MAX_UNAVAILABLE_NODES' parameter has been removed. --- metadata.sh | 2 +- operator/operator.yaml | 2 +- operator/params.yaml | 5 ----- templates/operator/params.yaml.template | 5 ----- 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/metadata.sh b/metadata.sh index d0425194..3a311bc9 100644 --- a/metadata.sh +++ b/metadata.sh @@ -20,7 +20,7 @@ export OPERATOR_NAME="cassandra" # More details about KUDO Versioning: # https://github.com/kudobuilder/kudo/pull/1028 # NOTE: Keep the version in tests in sync, see https://github.com/mesosphere/kudo-cassandra-operator/issues/136 -export OPERATOR_VERSION="1.0.0" +export OPERATOR_VERSION="1.0.1" # This should be an empty string on stable branches and "-SNAPSHOT" on # non-stable branches. diff --git a/operator/operator.yaml b/operator/operator.yaml index 1f82682a..43f761d4 100644 --- a/operator/operator.yaml +++ b/operator/operator.yaml @@ -1,6 +1,6 @@ apiVersion: kudo.dev/v1beta1 name: "cassandra" -operatorVersion: "1.0.0" +operatorVersion: "1.0.1" kudoVersion: "0.15.0-rc1" kubernetesVersion: "1.16.0" appVersion: "3.11.6" diff --git a/operator/params.yaml b/operator/params.yaml index 05513c11..871065e0 100644 --- a/operator/params.yaml +++ b/operator/params.yaml @@ -113,11 +113,6 @@ parameters: description: "The external port to use for Cassandra rpc protocol." default: "9160" - - name: MAX_UNAVAILABLE_NODES - displayName: "Max number of nodes that can be unavailable" - description: "Maximum number of nodes that are allowed to be down, either for restarts or from unscheduled outage. See PodDisruptionBudget" - default: 1 - - name: BOOTSTRAP_TIMEOUT description: "Timeout for the bootstrap binary to join the cluster with the new IP. Valid time units are 'ns', 'us', 'ms', 's', 'm', 'h'." default: "12h30m" diff --git a/templates/operator/params.yaml.template b/templates/operator/params.yaml.template index f5fac9cb..f07aa0f1 100644 --- a/templates/operator/params.yaml.template +++ b/templates/operator/params.yaml.template @@ -113,11 +113,6 @@ parameters: description: "The external port to use for Cassandra rpc protocol." default: "9160" - - name: MAX_UNAVAILABLE_NODES - displayName: "Max number of nodes that can be unavailable" - description: "Maximum number of nodes that are allowed to be down, either for restarts or from unscheduled outage. See PodDisruptionBudget" - default: 1 - - name: BOOTSTRAP_TIMEOUT description: "Timeout for the bootstrap binary to join the cluster with the new IP. Valid time units are 'ns', 'us', 'ms', 's', 'm', 'h'." default: "12h30m" From 7d6ba235979a6f9e5201748b34b7e7916c4494cc Mon Sep 17 00:00:00 2001 From: Jan Schlicht Date: Tue, 21 Jul 2020 13:25:17 +0200 Subject: [PATCH 2/3] Update generated files --- operator/params.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/operator/params.yaml b/operator/params.yaml index 871065e0..a4f1cdae 100644 --- a/operator/params.yaml +++ b/operator/params.yaml @@ -34,7 +34,7 @@ parameters: - name: NODE_DOCKER_IMAGE description: "Cassandra node Docker image." - default: "mesosphere/cassandra:3.11.6-1.0.0" + default: "mesosphere/cassandra:3.11.6-1.0.1" - name: NODE_DOCKER_IMAGE_PULL_POLICY description: "Cassandra node Docker image pull policy." @@ -173,7 +173,7 @@ parameters: - name: BACKUP_MEDUSA_DOCKER_IMAGE description: "Medusa backup Docker image." - default: "mesosphere/kudo-cassandra-medusa:0.6.0-1.0.0" + default: "mesosphere/kudo-cassandra-medusa:0.6.0-1.0.1" - name: BACKUP_MEDUSA_DOCKER_IMAGE_PULL_POLICY description: "Medusa backup Docker image pull policy." @@ -247,7 +247,7 @@ parameters: - name: PROMETHEUS_EXPORTER_DOCKER_IMAGE description: "Prometheus exporter Docker image." - default: "mesosphere/cassandra-prometheus-exporter:2.3.4-1.0.0" + default: "mesosphere/cassandra-prometheus-exporter:2.3.4-1.0.1" - name: PROMETHEUS_EXPORTER_DOCKER_IMAGE_PULL_POLICY description: "Prometheus exporter Docker image pull policy." @@ -1010,7 +1010,7 @@ parameters: - name: RECOVERY_CONTROLLER_DOCKER_IMAGE description: "Recovery controller Docker image." - default: "mesosphere/kudo-cassandra-recovery:0.0.2-1.0.0" + default: "mesosphere/kudo-cassandra-recovery:0.0.2-1.0.1" - name: RECOVERY_CONTROLLER_DOCKER_IMAGE_PULL_POLICY description: "Recovery controller Docker image pull policy." From 2e2ea6d6936f3c1af7f8298bd694ae0d1a782214 Mon Sep 17 00:00:00 2001 From: Jan Schlicht Date: Tue, 21 Jul 2020 14:13:37 +0200 Subject: [PATCH 3/3] Also format files --- docs/parameters.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/parameters.md b/docs/parameters.md index 2e743e89..49eee23d 100644 --- a/docs/parameters.md +++ b/docs/parameters.md @@ -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.6-1.0.0 | +| **NODE_DOCKER_IMAGE** | Cassandra node Docker image. | mesosphere/cassandra:3.11.6-1.0.1 | | **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 | @@ -28,7 +28,6 @@ | **EXTERNAL_RPC** | This exposes the Cassandra cluster via an external service so it can be accessed from outside the Kubernetes cluster. Works only if START_RPC is true | False | | **EXTERNAL_NATIVE_TRANSPORT_PORT** | The external port to use for Cassandra native transport protocol. | 9042 | | **EXTERNAL_RPC_PORT** | The external port to use for Cassandra rpc protocol. | 9160 | -| **MAX_UNAVAILABLE_NODES** | Maximum number of nodes that are allowed to be down, either for restarts or from unscheduled outage. See PodDisruptionBudget | 1 | | **BOOTSTRAP_TIMEOUT** | Timeout for the bootstrap binary to join the cluster with the new IP. Valid time units are 'ns', 'us', 'ms', 's', 'm', 'h'. | 12h30m | | **SHUTDOWN_OLD_REACHABLE_NODE** | When a node replace is done, try to connect to the old node and shut it down before starting up the old node | False | | **JOLOKIA_PORT** | The internal port for the Jolokia Agent. This port is not exposed, but can be changed if it conflicts with another port. | 7777 | @@ -42,7 +41,7 @@ | **BACKUP_MEDUSA_CPU_LIMIT_MC** | CPU limit (in millicores) for the Medusa backup containers. | 500 | | **BACKUP_MEDUSA_MEM_MIB** | Memory request (in MiB) for the Medusa backup containers. | 256 | | **BACKUP_MEDUSA_MEM_LIMIT_MIB** | Memory limit (in MiB) for the Medusa backup containers. | 512 | -| **BACKUP_MEDUSA_DOCKER_IMAGE** | Medusa backup Docker image. | mesosphere/kudo-cassandra-medusa:0.6.0-1.0.0 | +| **BACKUP_MEDUSA_DOCKER_IMAGE** | Medusa backup Docker image. | mesosphere/kudo-cassandra-medusa:0.6.0-1.0.1 | | **BACKUP_MEDUSA_DOCKER_IMAGE_PULL_POLICY** | Medusa backup Docker image pull policy. | Always | | **BACKUP_NAME** | The name of the backup to create or restore | | | **RESTORE_FLAG** | If true, a restore is done on installation | False | @@ -58,7 +57,7 @@ | **PROMETHEUS_EXPORTER_CPU_LIMIT_MC** | CPU limit (in millicores) for the Prometheus exporter containers. | 1000 | | **PROMETHEUS_EXPORTER_MEM_MIB** | Memory request (in MiB) for the Prometheus exporter containers. | 512 | | **PROMETHEUS_EXPORTER_MEM_LIMIT_MIB** | Memory limit (in MiB) for the Prometheus exporter containers. | 512 | -| **PROMETHEUS_EXPORTER_DOCKER_IMAGE** | Prometheus exporter Docker image. | mesosphere/cassandra-prometheus-exporter:2.3.4-1.0.0 | +| **PROMETHEUS_EXPORTER_DOCKER_IMAGE** | Prometheus exporter Docker image. | mesosphere/cassandra-prometheus-exporter:2.3.4-1.0.1 | | **PROMETHEUS_EXPORTER_DOCKER_IMAGE_PULL_POLICY** | Prometheus exporter Docker image pull policy. | Always | | **PROMETHEUS_EXPORTER_CUSTOM_CONFIG_CM_NAME** | The properties present in this configmap will be appended to the prometheus configuration properties | | | **STORAGE_PORT** | The port for inter-node communication. | 7000 | @@ -244,7 +243,7 @@ | **POD_MANAGEMENT_POLICY** | podManagementPolicy of the Cassandra Statefulset | OrderedReady | | **REPAIR_POD** | Name of the pod on which 'nodetool repair' should be run. | | | **RECOVERY_CONTROLLER** | Needs to be true for automatic failure recovery and node eviction | False | -| **RECOVERY_CONTROLLER_DOCKER_IMAGE** | Recovery controller Docker image. | mesosphere/kudo-cassandra-recovery:0.0.2-1.0.0 | +| **RECOVERY_CONTROLLER_DOCKER_IMAGE** | Recovery controller Docker image. | mesosphere/kudo-cassandra-recovery:0.0.2-1.0.1 | | **RECOVERY_CONTROLLER_DOCKER_IMAGE_PULL_POLICY** | Recovery controller Docker image pull policy. | Always | | **RECOVERY_CONTROLLER_CPU_MC** | CPU request (in millicores) for the Recovery controller container. | 50 | | **RECOVERY_CONTROLLER_CPU_LIMIT_MC** | CPU limit (in millicores) for the Recovery controller container. | 200 |