From 9fc234a54c194dce1b2fc419e46d4bdf87e6fb60 Mon Sep 17 00:00:00 2001 From: Aditya <60684641+0x0elliot@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:24:35 +0530 Subject: [PATCH] fix: better naming --- functions/kubernetes/all-in-one.yaml | 4 +-- functions/kubernetes/generate_certs.sh | 38 -------------------------- 2 files changed, 2 insertions(+), 40 deletions(-) delete mode 100755 functions/kubernetes/generate_certs.sh diff --git a/functions/kubernetes/all-in-one.yaml b/functions/kubernetes/all-in-one.yaml index 891a11d6..746215e9 100644 --- a/functions/kubernetes/all-in-one.yaml +++ b/functions/kubernetes/all-in-one.yaml @@ -64,8 +64,8 @@ data: SSO_REDIRECT_URL: "" TZ: "Europe/Amsterdam \t\t\t\t\t" IS_KUBERNETES: "true" - REGISTRY_URL: "172.17.14.71:5000" - REGISTRY_AUTH: "false" + REGISTRY_URL: "192.168.29.16:5000" + REGISTRY_AUTH: "false" SHUFFLE_KUBERNETES_WORKER: "ghcr.io/shuffle/shuffle-worker:nightly" kind: ConfigMap metadata: diff --git a/functions/kubernetes/generate_certs.sh b/functions/kubernetes/generate_certs.sh deleted file mode 100755 index 7b24b3e1..00000000 --- a/functions/kubernetes/generate_certs.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash -# Check if ifconfig is present and use it to get the default IP -if command -v ifconfig &> /dev/null; then - default_ip=$(ifconfig | grep 'inet ' | grep -v 127.0.0.1 | awk '{print $2}') -# Check if ip is present and use it if ifconfig is not available -elif command -v ip &> /dev/null; then - default_ip=$(ip addr show | grep -oP 'inet \K[\d.]+' | sed -n '2p') -# If both tools are not available, error out -else - echo "Error: Neither ifconfig nor ip command found in the machine. Exiting.." - exit 1 -fi - - -read -p "Enter your node IP to use for cert generation (default is $default_ip): " custom_ip -# Use localhost as the default value -node_ip=${custom_ip:-$default_ip} - -echo "Using node IP: $node_ip to generate SSL certs!" - -mkdir -p certs - -# Generate CA key -openssl req -newkey rsa:4096 -nodes -sha256 -keyout certs/reg.key -x509 -days 365 -out certs/reg.crt -subj "/CN=$node_ip" - -# generate a random string -random_string=$(openssl rand -hex 3) - -echo "Starting docker registry with name shuffle-local-registry-$random_string.." - -docker run -d -p 5000:5000 --restart=always --name "shuffle-local-registry-$random_string" \ - -v $(pwd)/certs:/certs \ - -e REGISTRY_HTTP_TLS_CERTIFICATE=/certs/reg.crt \ - -e REGISTRY_HTTP_TLS_KEY=/certs/reg.key \ - registry:2 - -echo "Done!" -