Commit 177e96a8 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

CockroachDB: 

- updated manifests to v22.2.0
- renamed namespace to crdb
- added script to launch cockroachdb client
parent 77483ce3

manifests/cockroachdb/README.md

+11 −11
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ kubectl apply -f "${DEPLOY_PATH}/crds.yaml" 
# Deploy CockroachDB Operator

curl -o "${DEPLOY_PATH}/operator.yaml" "${OPERATOR_BASE_URL}/install/operator.yaml"

# edit "${DEPLOY_PATH}/operator.yaml"

# - add env var: WATCH_NAMESPACE='tfs-crdb'

# - add env var: WATCH_NAMESPACE='crdb'

kubectl apply -f "${DEPLOY_PATH}/operator.yaml"



# Deploy CockroachDB
@@ -20,21 +20,21 @@ curl -o "${DEPLOY_PATH}/cluster.yaml" "${OPERATOR_BASE_URL}/examples/example.yam 
# edit "${DEPLOY_PATH}/cluster.yaml"

# - set version

# - set number of replicas

kubectl create namespace tfs-crdb

kubectl apply --namespace tfs-crdb -f "${DEPLOY_PATH}/cluster.yaml"

kubectl create namespace crdb

kubectl apply --namespace crdb -f "${DEPLOY_PATH}/cluster.yaml"



# Deploy CockroachDB Client

curl -o "${DEPLOY_PATH}/client-secure-operator.yaml" "${OPERATOR_BASE_URL}/examples/client-secure-operator.yaml"

kubectl create --namespace tfs-crdb -f "${DEPLOY_PATH}/client-secure-operator.yaml"

kubectl create --namespace crdb -f "${DEPLOY_PATH}/client-secure-operator.yaml"



# Add tfs user with admin rights

$ kubectl exec -it cockroachdb-client-secure --namespace tfs-crdb -- ./cockroach sql --certs-dir=/cockroach/cockroach-certs --host=cockroachdb-public

-- CREATE USER tfs WITH PASSWORD 'tfs123';

-- GRANT admin TO tfs;

kubectl exec -it cockroachdb-client-secure --namespace crdb -- ./cockroach sql --certs-dir=/cockroach/cockroach-certs --host=cockroachdb-public

    CREATE USER tfs WITH PASSWORD 'tfs123';

    GRANT admin TO tfs;



# Expose CockroachDB SQL port (26257)

PORT=$(kubectl --namespace tfs-crdb get service cockroachdb-public -o 'jsonpath={.spec.ports[?(@.name=="sql")].port}')

PATCH='{"data": {"'${PORT}'": "tfs-crdb/cockroachdb-public:'${PORT}'"}}'

PORT=$(kubectl --namespace crdb get service cockroachdb-public -o 'jsonpath={.spec.ports[?(@.name=="sql")].port}')

PATCH='{"data": {"'${PORT}'": "crdb/cockroachdb-public:'${PORT}'"}}'

kubectl patch configmap nginx-ingress-tcp-microk8s-conf --namespace ingress --patch "${PATCH}"



PORT_MAP='{"containerPort": '${PORT}', "hostPort": '${PORT}'}'
@@ -43,8 +43,8 @@ PATCH='{"spec": {"template": {"spec": {"containers": ['${CONTAINER}']}}}}' 
kubectl patch daemonset nginx-ingress-microk8s-controller --namespace ingress --patch "${PATCH}"



# Expose CockroachDB Console port (8080)

PORT=$(kubectl --namespace tfs-crdb get service cockroachdb-public -o 'jsonpath={.spec.ports[?(@.name=="http")].port}')

PATCH='{"data": {"'${PORT}'": "tfs-crdb/cockroachdb-public:'${PORT}'"}}'

PORT=$(kubectl --namespace crdb get service cockroachdb-public -o 'jsonpath={.spec.ports[?(@.name=="http")].port}')

PATCH='{"data": {"'${PORT}'": "crdb/cockroachdb-public:'${PORT}'"}}'

kubectl patch configmap nginx-ingress-tcp-microk8s-conf --namespace ingress --patch "${PATCH}"



PORT_MAP='{"containerPort": '${PORT}', "hostPort": '${PORT}'}'

manifests/cockroachdb/client-secure-operator.yaml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ spec: 
  serviceAccountName: cockroachdb-sa

  containers:

  - name: cockroachdb-client-secure

    image: cockroachdb/cockroach:v22.1.8

    image: cockroachdb/cockroach:v22.2.0

    imagePullPolicy: IfNotPresent

    volumeMounts:

    - name: client-certs

manifests/cockroachdb/cluster.yaml

+2 −2
Original line number Diff line number Diff line
@@ -40,9 +40,9 @@ spec: 
      memory: 4Gi

  tlsEnabled: true

# You can set either a version of the db or a specific image name

# cockroachDBVersion: v22.1.12

# cockroachDBVersion: v22.2.0

  image:

    name: cockroachdb/cockroach:v22.1.12

    name: cockroachdb/cockroach:v22.2.0

  # nodes refers to the number of crdb pods that are created

  # via the statefulset

  nodes: 3

manifests/cockroachdb/operator.yaml

+16 −2
Original line number Diff line number Diff line
@@ -478,6 +478,10 @@ spec: 
          value: cockroachdb/cockroach:v21.1.18

        - name: RELATED_IMAGE_COCKROACH_v21_1_19

          value: cockroachdb/cockroach:v21.1.19

        - name: RELATED_IMAGE_COCKROACH_v21_1_20

          value: cockroachdb/cockroach:v21.1.20

        - name: RELATED_IMAGE_COCKROACH_v21_1_21

          value: cockroachdb/cockroach:v21.1.21

        - name: RELATED_IMAGE_COCKROACH_v21_2_0

          value: cockroachdb/cockroach:v21.2.0

        - name: RELATED_IMAGE_COCKROACH_v21_2_1
@@ -510,6 +514,8 @@ spec: 
          value: cockroachdb/cockroach:v21.2.15

        - name: RELATED_IMAGE_COCKROACH_v21_2_16

          value: cockroachdb/cockroach:v21.2.16

        - name: RELATED_IMAGE_COCKROACH_v21_2_17

          value: cockroachdb/cockroach:v21.2.17

        - name: RELATED_IMAGE_COCKROACH_v22_1_0

          value: cockroachdb/cockroach:v22.1.0

        - name: RELATED_IMAGE_COCKROACH_v22_1_1
@@ -526,10 +532,18 @@ spec: 
          value: cockroachdb/cockroach:v22.1.7

        - name: RELATED_IMAGE_COCKROACH_v22_1_8

          value: cockroachdb/cockroach:v22.1.8

        - name: RELATED_IMAGE_COCKROACH_v22_1_10

          value: cockroachdb/cockroach:v22.1.10

        - name: RELATED_IMAGE_COCKROACH_v22_1_11

          value: cockroachdb/cockroach:v22.1.11

        - name: RELATED_IMAGE_COCKROACH_v22_1_12

          value: cockroachdb/cockroach:v22.1.12

        - name: RELATED_IMAGE_COCKROACH_v22_2_0

          value: cockroachdb/cockroach:v22.2.0

        - name: OPERATOR_NAME

          value: cockroachdb

        - name: WATCH_NAMESPACE

          value: tfs-ccdb

          value: crdb

        - name: POD_NAME

          valueFrom:

            fieldRef:
@@ -538,7 +552,7 @@ spec: 
          valueFrom:

            fieldRef:

              fieldPath: metadata.namespace

        image: cockroachdb/cockroach-operator:v2.8.0

        image: cockroachdb/cockroach-operator:v2.9.0

        imagePullPolicy: IfNotPresent

        name: cockroach-operator

        resources:

scripts/cockroachdb_client.sh

0 → 100755
+16 −0
Original line number Diff line number Diff line 
#!/bin/bash

# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



kubectl exec -it cockroachdb-client-secure --namespace crdb -- ./cockroach sql --certs-dir=/cockroach/cockroach-certs --host=cockroachdb-public