From 7b63e4669922c65860937ce61ac0e58c4a305bf1 Mon Sep 17 00:00:00 2001 From: Ken Raffenetti Date: Mon, 20 Oct 2025 15:41:12 -0500 Subject: [PATCH 1/6] Fix paths to yaml files --- create-beehive.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/create-beehive.sh b/create-beehive.sh index c749f3c..12e15bd 100755 --- a/create-beehive.sh +++ b/create-beehive.sh @@ -6,17 +6,17 @@ cd $(dirname $0) echo "deploying rabbitmq" -kubectl apply -f kubernetes/beehive-rabbitmq.yaml +kubectl apply -f kubernetes/beehive-rabbitmq/beehive-rabbitmq.yaml echo "deploying message logger" ./update-rabbitmq-auth.sh beehive-message-logger-auth beehive-message-logger '.*' '.*' '.*' kubectl apply -f kubernetes/beehive-message-logger.yaml echo "deploying upload server" -kubectl apply -f kubernetes/beehive-upload-server.yaml +kubectl apply -f kubernetes/beehive-upload-server/beehive-upload-server.yaml echo "deploying influxdb" -kubectl apply -f kubernetes/beehive-influxdb.yaml +kubectl apply -f kubernetes/beehive-influxdb/beehive-influxdb.yaml setup_influxdb() { kubectl exec svc/beehive-influxdb -- influx setup \ @@ -53,7 +53,7 @@ token=$(generate_influxdb_token --write-buckets) kubectl create secret generic beehive-influxdb-loader-influxdb-token \ --from-literal=token="$token" ./update-rabbitmq-auth.sh beehive-influxdb-loader-auth beehive-influxdb-loader '.*' '.*' '.*' -kubectl apply -f kubernetes/beehive-influxdb-loader.yaml +kubectl apply -f kubernetes/beehive-influxdb-loader/beehive-influxdb-loader.yaml echo "generating token for data api" token=$(generate_influxdb_token --read-buckets) From 8eb016dcbef5d55384772d6fa2aadadc2e5f243b Mon Sep 17 00:00:00 2001 From: Ken Raffenetti Date: Fri, 31 Oct 2025 10:12:05 -0500 Subject: [PATCH 2/6] Fix influxdb setup test Make sure to capture both stdout and stderr when attempting to start influxdb. Messages about it already being setup are printing to stderr in my environment. Also fix a typo match expression "setup"->"set up". --- create-beehive.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/create-beehive.sh b/create-beehive.sh index 12e15bd..39f7b13 100755 --- a/create-beehive.sh +++ b/create-beehive.sh @@ -29,10 +29,10 @@ setup_influxdb() { echo "setting up influxdb" while true; do - if msg=$(setup_influxdb); then + if msg=$(setup_influxdb 2>&1) ; then break fi - if [[ "$msg" == *"already been setup"* ]]; then + if [[ "$msg" == *"already been set up"* ]]; then echo "influxdb already setup. skipping." break fi From e6216f6c397a1b46f157b521aedda4baf84cb0d2 Mon Sep 17 00:00:00 2001 From: Ken Raffenetti Date: Fri, 7 Nov 2025 10:01:32 -0600 Subject: [PATCH 3/6] Revert support for namespaces This reverts commits [958b1923] and [dca62596]. Namespace support is not fully baked for instance in the create-beehive.sh script. We can add it back later when we have it sorted out. --- update-rabbitmq-auth.sh | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/update-rabbitmq-auth.sh b/update-rabbitmq-auth.sh index e01a7c2..3296ac2 100755 --- a/update-rabbitmq-auth.sh +++ b/update-rabbitmq-auth.sh @@ -1,18 +1,15 @@ #!/bin/bash -set -e rmqctl() { - kubectl exec svc/beehive-rabbitmq -c beehive-rabbitmq -n ${rmq_namespace} -- rabbitmqctl "$@" + kubectl exec svc/beehive-rabbitmq -c beehive-rabbitmq -- rabbitmqctl "$@" } -secret_namespace="$1" -secretname="$2" -rmq_namespace="$3" -username="$4" -confperm="$5" -writeperm="$6" -readperm="$7" -tags="$8" +secretname="$1" +username="$2" +confperm="$3" +writeperm="$4" +readperm="$5" +tags="$6" password="$(openssl rand -hex 20)" echo "updating kubernetes config ${secretname}..." @@ -21,7 +18,6 @@ apiVersion: v1 kind: Secret metadata: name: ${secretname} - namespace: ${secret_namespace} type: kubernetes.io/basic-auth stringData: username: ${username} From 255aa37eb82f2a496567b4d74a536c2c04730594 Mon Sep 17 00:00:00 2001 From: Ken Raffenetti Date: Fri, 7 Nov 2025 10:20:34 -0600 Subject: [PATCH 4/6] Fix secret names for rabbitmq and upload server Fix names to reflect the ones created by the current scripts in waggle-pki-tools. --- kubernetes/beehive-rabbitmq/beehive-rabbitmq.yaml | 2 +- kubernetes/beehive-upload-server/beehive-upload-server.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kubernetes/beehive-rabbitmq/beehive-rabbitmq.yaml b/kubernetes/beehive-rabbitmq/beehive-rabbitmq.yaml index ce8dad5..7a100c2 100644 --- a/kubernetes/beehive-rabbitmq/beehive-rabbitmq.yaml +++ b/kubernetes/beehive-rabbitmq/beehive-rabbitmq.yaml @@ -156,7 +156,7 @@ spec: name: beehive-ca-certificate - name: tls secret: - secretName: beehive-rabbitmq-tls-secret + secretName: rabbitmq-tls-secret - name: data persistentVolumeClaim: claimName: rabbitmq-data diff --git a/kubernetes/beehive-upload-server/beehive-upload-server.yaml b/kubernetes/beehive-upload-server/beehive-upload-server.yaml index a2d2f06..71766fb 100644 --- a/kubernetes/beehive-upload-server/beehive-upload-server.yaml +++ b/kubernetes/beehive-upload-server/beehive-upload-server.yaml @@ -72,7 +72,7 @@ spec: name: beehive-ssh-ca - name: ssh-host-key secret: - secretName: beehive-upload-server-ssh-host-key + secretName: upload-server-ssh-host-key defaultMode: 0600 - name: home-dirs persistentVolumeClaim: From aa7de22cda4c8779214937ba25a9711f99b101b9 Mon Sep 17 00:00:00 2001 From: Ken Raffenetti Date: Fri, 7 Nov 2025 11:26:47 -0600 Subject: [PATCH 5/6] Do not ignore .github directory Plan to use GitHub actions means we need to monitor this directory. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index b13082d..3a55a20 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .*/ +!.github/ *.pem .DS_Store From a268d1ea4e7dc9e763c8ec6462a1039841a9e9df Mon Sep 17 00:00:00 2001 From: Ken Raffenetti Date: Fri, 7 Nov 2025 11:26:34 -0600 Subject: [PATCH 6/6] Add basic ci config Test the create-beehive.sh script on a simple k3s cluster. --- .github/workflows/ci.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..e3b83cf --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,12 @@ +on: [push, pull_request] + +jobs: + create-beehive: + runs-on: ubuntu-latest + steps: + - uses: nolar/setup-k3d-k3s@v1 + - uses: actions/checkout@v5 + - run: | + git clone https://github.com/waggle-sensor/waggle-pki-tools + pushd waggle-pki-tools && ./create-credentials-for-beehive.sh && popd + ./create-beehive.sh