Orange-OpenSource · cscetbon · May 31, 2021 · Aug 24, 2020 · Aug 25, 2020 · Aug 26, 2020
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -35,8 +35,8 @@ orbs:
         executor: vm
         working_directory: /home/circleci/<< parameters.operatorDir >>
         environment:
-          K3S_IMAGE: rancher/k3s:v1.18.4-k3s1
-          K8S_VERSION: v1.18.4
+          K3S_IMAGE: rancher/k3s:v1.20.6-k3s1
+          K8S_VERSION: v1.20.6
           GOPATH: /go
           GO111MODULE: on
           DOCKER_LATEST: 1
@@ -95,6 +95,7 @@ orbs:
               name: Operator acceptance test
               no_output_timeout: 1200
               command: |
+                ln -s test/e2e/testdata
                 if [ << parameters.test_type >> = "e2e" ]
                 then
                   kubectl create namespace cassandra-e2e
@@ -350,8 +351,6 @@ jobs:
       - run:
           name: deploy
           command: |
-            echo $(pwd)
-            ls -la
             git config --global user.name "${GH_NAME}"
             git config --global user.email "${GH_EMAIL}"
             echo "machine github.com login ${GH_NAME} password ${GH_TOKEN}" > ~/.netrc

diff --git a/Makefile b/Makefile
@@ -21,7 +21,7 @@ DOCKER_REPO_BASE_TEST ?= orangeopensource
 IMAGE_NAME := $(SERVICE_NAME)
 BUILD_IMAGE ?= orangeopensource/casskop-build
 
-BOOTSTRAP_IMAGE ?= orangeopensource/cassandra-bootstrap:0.1.7
+BOOTSTRAP_IMAGE ?= orangeopensource/cassandra-bootstrap:0.1.9
 TELEPRESENCE_REGISTRY ?= datawire
 KUBESQUASH_REGISTRY:=
 
@@ -182,13 +182,19 @@ docker-generate-k8s:
 		--env https_proxy=$(https_proxy) --env http_proxy=$(http_proxy) \
 		$(BUILD_IMAGE):$(OPERATOR_SDK_VERSION) /bin/bash -c 'operator-sdk generate k8s'
 
+SPEC_PROPS = .spec.versions[0].schema.openAPIV3Schema.properties.spec.properties
+
 docker-generate-crds:
 	echo "Generate crds"
 	docker run --rm -v $(PWD):$(WORKDIR) -v $(GOPATH)/pkg/mod:/go/pkg/mod:delegated \
 		-v $(shell go env GOCACHE):/root/.cache/go-build:delegated --env GO111MODULE=on \
 		--env https_proxy=$(https_proxy) --env http_proxy=$(http_proxy) \
 		$(BUILD_IMAGE):$(OPERATOR_SDK_VERSION) /bin/bash -c 'operator-sdk generate crds'
-	@sed -i '/\- protocol/d' deploy/crds/db.orange.com_cassandraclusters_crd.yaml
+	echo Update CRD - Remove protocol and set config type to object CRD
+	@sed -i -e '/\- protocol/d' deploy/crds/db.orange.com_cassandraclusters_crd.yaml
+	@yq -i e '$(SPEC_PROPS).config.type = "object"' deploy/crds/db.orange.com_cassandraclusters_crd.yaml
+	@yq -i e '$(SPEC_PROPS).topology.properties.dc.items.properties.config.type = "object"' deploy/crds/db.orange.com_cassandraclusters_crd.yaml
+	@yq -i e '$(SPEC_PROPS).topology.properties.dc.items.properties.rack.items.properties.config.type = "object"' deploy/crds/db.orange.com_cassandraclusters_crd.yaml
 	cp -v deploy/crds/* helm/*/crds/
 	cp -v deploy/crds/* */helm/*/crds/
 

diff --git a/deploy/crds/db.orange.com_cassandraclusters_crd.yaml b/deploy/crds/db.orange.com_cassandraclusters_crd.yaml
diff --git a/docker/bootstrap/Changelog.md b/docker/bootstrap/Changelog.md
diff --git a/docker/bootstrap/Makefile b/docker/bootstrap/Makefile
@@ -19,7 +19,7 @@ else
 	PROJECT:=$(CI_REGISTRY_IMAGE)
 endif
 
-VERSION:=0.1.8
+VERSION:=0.1.9
 TAG?=${VERSION}
 ifeq ($(CIRCLE_BRANCH),master)
 	BRANCH:=latest

diff --git a/docker/bootstrap/bootstrap.sh b/docker/bootstrap/bootstrap.sh
@@ -1,21 +1,14 @@
 #!/usr/bin/env bash
 set -e
 
-# Copies any default config files from CassKop bootstrapper image to the /etc/cassandra volume which will replace the one used in cassandra image
+# Copies any default config files from CassKop bootstrapper image to /etc/cassandra volume which will replace the one used in cassandra image
 cp -rLv /${BOOTSTRAP_CONF}/* /etc/cassandra/
 
-# If User has submited a configMap, we uses them to deplace default ones
-# (overwriting the above)
-if [[ -d ${CONFIGMAP} && ! -z `ls -A ${CONFIGMAP}` ]] ; then
-    echo "We have a ConfigMap, we surcharge default configuration files"
-    cp -rLv ${CONFIGMAP}/* /etc/cassandra/
-fi
-
 # Copies any extra libraries from this bootstrapper image to the extra-lib empty-dir
 if [[ -d /${BOOTSTRAP_LIBS} && ! -z `ls -A /${BOOTSTRAP_LIBS}` ]] ; then
     echo "We have additional libraries, we copy them over"
     cp -v ${BOOTSTRAP_LIBS}/* $CASSANDRA_LIBS/
-   fi
+fi
 
 cp -v /${BOOTSTRAP_TOOLS}/* $CASSANDRA_TOOLS/
 
@@ -33,4 +26,4 @@ if [ -f ${CONFIGMAP}/post_run.sh ]; then
     ${CONFIGMAP}/post_run.sh
 fi
 
-echo '== bootstrap ended :-)'
+echo '**** bootstrap ended ****'
diff --git a/docker/bootstrap/dgoss/checks/goss.yaml b/docker/bootstrap/dgoss/checks/goss.yaml
@@ -58,18 +58,13 @@ file:
   /etc/cassandra/cassandra-env.sh:
     exists: true
     contains:
-      - "LOCAL_JMX=no"
       - "/extra-lib/jolokia-agent.jar"
       - "-javaagent:/extra-lib/cassandra-exporter-agent.jar=@/etc/cassandra/exporter.conf"
 
   /etc/cassandra/exporter.conf:
     exists: true
     contains: ["--listen=:9500"]
 
-  # pre_run.sh is created through configmap which is not used in this test
-  /etc/cassandra/pre_run.sh:
-    exists: false
-
   /etc/cassandra/liveness-probe.sh:
     exists: true
 

diff --git a/docker/bootstrap/dgoss/test-with-configmap/goss.yaml b/docker/bootstrap/dgoss/test-with-configmap/goss.yaml
diff --git a/docker/bootstrap/dgoss/test-with-configmap/run.sh b/docker/bootstrap/dgoss/test-with-configmap/run.sh
diff --git a/docker/bootstrap/dgoss/test-without-volumes/goss.yaml b/docker/bootstrap/dgoss/test-without-volumes/goss.yaml
@@ -36,10 +36,6 @@ file:
       - "!jolokia-agent.jar"
       - "!javaagent:/extra-lib/cassandra-exporter-agent.jar=@/etc/cassandra/exporter.conf"
 
-  # pre_run.sh is created through configmap which is not used in this test
-  /etc/cassandra/pre_run.sh:
-    exists: false
-
   /etc/cassandra/liveness-probe.sh:
     exists: true
 

diff --git a/docker/bootstrap/dgoss/util.sh b/docker/bootstrap/dgoss/util.sh
@@ -1,8 +1,38 @@
 #!/bin/bash
 
-CASSANDRA_IMAGE=cassandra:latest
-
+CASSANDRA_IMAGE=cassandra:3.11.6
+CASSANDRA_SEEDS=cassandra-demo-dc1-rack1-0.cassandra-demo.ns,cassandra-demo-dc1-rack2-0.cassandra-demo.ns,cassandra-demo-dc1-rack3-0.cassandra-demo.ns
 CASSANDRA_UID=1000
+CASSANDRA_DC=dc1
+CASSANDRA_RACK=rack1
+
+CONFIG_FILE_DATA=$(cat <<-EOF
+    {
+      "cassandra-yaml": {
+        "max_hints_delivery_threads": 8,
+        "authenticator": "PasswordAuthenticator",
+        "authorizer": "CassandraAuthorizer"
+      },
+      "cluster-info": {
+        "name": "cassandra-e2e",
+        "seeds": "$CASSANDRA_SEEDS"
+      },
+      "datacenter-info": {
+        "name": "$CASSANDRA_DC"
+      },
+      "jvm-options": {
+        "cassandra_ring_delay_ms": 30000,
+        "initial_heap_size": "64M",
+        "jmx-connection-type": "remote-no-auth",
+        "max_heap_size": "256M",
+        "print_flss_statistics": true
+      },
+      "logback-xml": {
+        "debuglog-enabled": false
+      }
+    }
+EOF
+)
 
 BOOTSTRAP_VOLUME=dgoss-bootstrap-vol
 EXTRA_LIB_VOLUME=dgoss-extralib-vol
@@ -24,12 +54,21 @@ function deleteDgossVolumes {
 
 function createInitConfigContainer {
     echo "== createInitConfigContainer"
+    docker run --rm -u 0 \
+           -v ${BOOTSTRAP_VOLUME}:/bootstrap \
+           -e PRODUCT_NAME=$(echo $CASSANDRA_IMAGE|cut -d: -f1) \
+           -e PRODUCT_VERSION=$(echo $CASSANDRA_IMAGE|cut -d: -f2) \
+           -e CONFIG_FILE_DATA="$CONFIG_FILE_DATA" \
+           -e CONFIG_OUTPUT_DIRECTORY=/bootstrap \
+           -e RACK_NAME=$CASSANDRA_RACK \
+           datastax/cass-config-builder:1.0.3
+
     docker run --rm \
            -v ${BOOTSTRAP_VOLUME}:/bootstrap \
            -v ${EXTRA_LIB_VOLUME}:/extra-lib \
            --entrypoint=bash \
            ${CASSANDRA_IMAGE} \
-           -c "cp -vr /etc/cassandra/* /bootstrap && chown -R cassandra: /bootstrap /extra-lib"
+           -c "chown -R cassandra: /bootstrap /extra-lib"
 }
 
 function checkDgossVolumes {
@@ -47,17 +86,11 @@ function createCassandraBootstrapContainer {
     docker run \
            -u 999 \
            --rm -ti \
-           -e CASSANDRA_MAX_HEAP=1024M \
-           -e CASSANDRA_SEEDS=cassandra-demo-dc1-rack1-0.cassandra-demo.ns,cassandra-demo-dc1-rack2-0.cassandra-demo.ns,cassandra-demo-dc1-rack3-0.cassandra-demo.ns \
-           -e CASSANDRA_CLUSTER_NAME=cassandra-demo \
-           -e CASSANDRA_AUTO_BOOTSTRAP=true \
+           -e CASSANDRA_SEEDS=$CASSANDRA_SEEDS \
            -e HOSTNAME=cassandra-seb-dc1-rack1-0 \
            -e POD_NAME=cassandra-demo-dc1-rack1-0 \
-           -e POD_NAMESPACE=ns \
-           -e CASSANDRA_GC_STDOUT=true \
-           -e CASSANDRA_NUM_TOKENS=32 \
-           -e CASSANDRA_DC=dc1 \
-           -e CASSANDRA_RACK=rack1 \
+           -e CASSANDRA_DC=$CASSANDRA_DC \
+           -e CASSANDRA_RACK=$CASSANDRA_RACK \
            -v ${BOOTSTRAP_VOLUME}:/etc/cassandra/ \
            -v ${CONFIGMAP_VOLUME}:/configmap \
            -v ${EXTRA_LIB_VOLUME}:/extra-lib/ \
@@ -71,19 +104,13 @@ function createCassandraBootstrapContainerNoExtraLib {
     docker run \
            -u 999 \
            --rm -ti \
-           -e CASSANDRA_MAX_HEAP=1024M \
-           -e CASSANDRA_SEEDS=cassandra-demo-dc1-rack1-0.cassandra-demo.ns,cassandra-demo-dc1-rack2-0.cassandra-demo.ns,cassandra-demo-dc1-rack3-0.cassandra-demo.ns \
-           -e CASSANDRA_CLUSTER_NAME=cassandra-demo \
-           -e CASSANDRA_AUTO_BOOTSTRAP=true \
+           -e CASSANDRA_SEEDS=$CASSANDRA_SEEDS \
            -e HOSTNAME=cassandra-seb-dc1-rack1-0 \
            -e POD_NAME=cassandra-demo-dc1-rack1-0 \
-           -e POD_NAMESPACE=ns \
-           -e CASSANDRA_GC_STDOUT=true \
            -e CASSANDRA_ENABLE_JOLOKIA=false \
            -e CASSANDRA_EXPORTER_AGENT=false \
-           -e CASSANDRA_NUM_TOKENS=32 \
-           -e CASSANDRA_DC=dc1 \
-           -e CASSANDRA_RACK=rack1 \
+           -e CASSANDRA_DC=$CASSANDRA_DC \
+           -e CASSANDRA_RACK=$CASSANDRA_RACK \
            -v ${BOOTSTRAP_VOLUME}:/etc/cassandra/ \
            ${IMAGE_TO_TEST} 
 }
@@ -93,17 +120,12 @@ function createCassandraBootstrapContainerWithConfigMap {
     docker run \
           -u 999 \
            --rm -ti \
-           -e CASSANDRA_MAX_HEAP=1024M \
-           -e CASSANDRA_SEEDS=cassandra-demo-dc1-rack1-0.cassandra-demo.ns,cassandra-demo-dc1-rack2-0.cassandra-demo.ns,cassandra-demo-dc1-rack3-0.cassandra-demo.ns \
+           -e CASSANDRA_SEEDS=$CASSANDRA_SEEDS \
            -e CASSANDRA_CLUSTER_NAME=cassandra-demo \
-           -e CASSANDRA_AUTO_BOOTSTRAP=true \
            -e HOSTNAME=cassandra-seb-dc1-rack1-0 \
            -e POD_NAME=cassandra-demo-dc1-rack1-0 \
-           -e POD_NAMESPACE=ns \
-           -e CASSANDRA_GC_STDOUT=true \
-           -e CASSANDRA_NUM_TOKENS=32 \
-           -e CASSANDRA_DC=dc1 \
-           -e CASSANDRA_RACK=rack1 \
+           -e CASSANDRA_DC=$CASSANDRA_DC \
+           -e CASSANDRA_RACK=$CASSANDRA_RACK \
            -v ${BOOTSTRAP_VOLUME}:/etc/cassandra/ \
            -v ${CONFIGMAP_VOLUME}:/configmap \
            -v ${EXTRA_LIB_VOLUME}:/extra-lib/ \