From eb8c952523390c5554978308c03eb94a80c092af Mon Sep 17 00:00:00 2001 From: chrisfu Date: Mon, 27 Apr 2026 14:08:29 -0700 Subject: [PATCH] chore(deploy): cluster config and k3s manifest updates Co-Authored-By: Claude Sonnet 4.6 --- conf/cnpg-placement/knoe-system-knoe-db.json | 22 ++-- conf/k3d.cfg | 107 +++++------------- conf/k3s.cfg | 44 +++---- deploy.sh | 6 +- .../manifests/knoe/garage-statefulset.yaml | 2 +- .../k3s/manifests/opentofu/deployment.yaml | 2 +- 6 files changed, 64 insertions(+), 119 deletions(-) diff --git a/conf/cnpg-placement/knoe-system-knoe-db.json b/conf/cnpg-placement/knoe-system-knoe-db.json index 0d1f250..c82084b 100644 --- a/conf/cnpg-placement/knoe-system-knoe-db.json +++ b/conf/cnpg-placement/knoe-system-knoe-db.json @@ -1,23 +1,15 @@ { - "assignments": { - "0": "gke-knoe-dev-0-default-pool-02b40136-m9h9", - "1": "gke-knoe-dev-0-default-pool-6fb9e725-8ldx", - "2": "gke-knoe-dev-0-default-pool-d65ac672-9ncf" - }, + "assignments": {}, "cluster_name": "knoe-db", "desired_instances": 3, - "eligible_nodes": [ - "gke-knoe-dev-0-default-pool-02b40136-m9h9", - "gke-knoe-dev-0-default-pool-6fb9e725-8ldx", - "gke-knoe-dev-0-default-pool-d65ac672-9ncf" - ], + "eligible_nodes": [], "metadata": { "prior_plan_present": true, - "reason": "reused", - "regenerated": false, - "reused": true + "reason": "new_cluster", + "regenerated": true, + "reused": false }, - "plan_hash": "a44825aeb5ed4e13", - "plan_id": "cnpg-placement-a44825aeb5ed4e13", + "plan_hash": "965d2fde4035059f", + "plan_id": "cnpg-placement-965d2fde4035059f", "schema_version": "v1" } diff --git a/conf/k3d.cfg b/conf/k3d.cfg index 1fe10d9..2100295 100644 --- a/conf/k3d.cfg +++ b/conf/k3d.cfg @@ -1,5 +1,5 @@ ; Knoe Master Configuration File -; Generated by install.py on 2026-04-14 06:09:00 +; Generated by install.py on 2026-04-22 21:15:00 ; This file is used as input for Ansible deployment and k8s cluster creation. [User] @@ -28,37 +28,35 @@ database_options.ext.pgvector = true database_options.ext.postgis = true database_options.ext.postgres_fdw = true database_options.version_type = v18 -dependencies.ansible.install = true dependencies.auto_install_missing = true dependencies.brew.install = true +dependencies.containerd.install = true +dependencies.docker-buildx.install = true dependencies.docker.install = true dependencies.gcloud.install = true dependencies.k3d.install = true dependencies.kubectl.install = true dependencies.kubectx.install = true +dependencies.op.install = true dependencies.opentofu.install = true dependencies.python.install = true dependencies.verify_all = false disk_selection.disk_type = local -disk_selection.local_path = /Users/chrisfu/dev/knoe/knoe-tools-app/dist +disk_selection.local_path = /Users/chrisfu/dev/knoe-db/knoe-tools-app/dist disk_selection.removable_mount = env_setup.CLUSTER_NAME = ${CLUSTER_NAME} env_setup.DATABASE_NAMESPACE = ${DATABASE_NAMESPACE} -env_setup.KNOE_CONF = /Users/chrisfu/dev/knoe/conf -env_setup.PROLE_DATA = /Users/chrisfu/dev/knoe/data -env_setup.KNOE_HOME = /Users/chrisfu/dev/knoe -env_setup.PROLE_LOGS = /Users/chrisfu/dev/knoe/logs -env_setup.KNOE_SERVICE = /Users/chrisfu/dev/knoe/etc +env_setup.KNOE_CONF = /Users/chrisfu/dev/knoe-db/conf gitops.git_provider = Gitea gitops.node_selector = init_cluster.argocd_enabled = false init_cluster.at_rest_encryption_enabled = true init_cluster.cluster_env = dev init_cluster.deployment_target = knoe-dev-cluster -init_cluster.gitops_enabled = true -init_cluster.k3s_server_url = https://myrddin.knoe.org:6443 +init_cluster.gitops_enabled = false +init_cluster.k3s_server_url = https://myrddin.prole.org:6443 init_cluster.k3s_token = ${KNOE_SECRET:v1:-cslrAhG8WhxxJLY:vAx5MGOBcU1NBMjf4U-3y1djMDmwwOjiWkrutxPa4Li5P8RBjCBhEOCEdGP2CiPJJ6UQK-ietX-mu_5nO3yNNjpwDququT4U6lWHPEInSvUNH6ImU-HzPvm_diL2FwJtZm3sY5HgecIy2dwXB_vLnYaA_7VXt9zf0T70rw==} -init_cluster.kerberos_enabled = true +init_cluster.kerberos_enabled = false init_cluster.mode = k3d init_cluster.start_cluster = true init_cluster.supabase_enabled = false @@ -73,10 +71,10 @@ init_password.db_password_confirm = init_password.db_username = root init_password.generate_ssh_key = true init_scripts.run_scripts = true -kerberos_config.enabled = true -kerberos_config.kdc = 10.0.0.3 +kerberos_config.enabled = false +kerberos_config.kdc = kerberos_config.password = -kerberos_config.realm = PROLE.ORG +kerberos_config.realm = kerberos_config.test_connection = false kerberos_config.user = administrator network_scan.run = true @@ -84,132 +82,87 @@ ollama_config.model = ollama_config.server_host = ollama_config.server_port = 11434 supabase_config.pv_base_dir = /synology/d005 -supabase_config.pv_node = gandalf.knoe.org +supabase_config.pv_node = [Global] ; Variables used by name in more than one place or assumed global scope -ARGOCD_NAMESPACE = argocd -ARTIFACT_REGISTRY = us-west3-docker.pkg.dev/plenary-truck-485623-p7/knoe-system -AUTHORITY_ENABLED = true -AUTH_HOSTNAME = api.knoe.org -AUTH_LOGIN_PATH = /auth/login -AUTH_RESPONSE_HEADERS = X-Knoe-User,X-Knoe-Email,X-Knoe-Groups -AUTH_VERIFY_PATH = /auth/verify CLUSTER_ENV = dev CLUSTER_NAME = knoe-db -CNPG_PLACEMENT_PLAN_FILE = /Users/chrisfu/dev/knoe/conf/cnpg-placement/knoe-system-knoe-db.json -CNPG_PLACEMENT_PLAN_HASH = 965d2fde4035059f -CNPG_PLACEMENT_PLAN_ID = cnpg-placement-965d2fde4035059f -DATABASE_NAMESPACE = knoe-db-18-008-18-009-18-013-18-014 +DATABASE_NAMESPACE = knoe-db-18-140 DB_HOST_PORT = 5432 DEPLOYMENT_MODE = k3d DEPLOYMENT_TARGET = knoe-dev-cluster DOCKER_PRELOAD = false -GITLAB_PUBLIC_HOSTS = git.knoe.dev,git.knoe.org -K3S_SERVER = https://myrddin.knoe.org:6443 -K3S_TOKEN = ${KNOE_SECRET:v1:CWWf3RHFdbUrmfrY:It8a2G8QUUIsqVwMsm3LsI4UvSSChEc_uAdESwzYplZLOCiSsCbOKuT9FbPpIwQvEaG_gLz9ZAfkD0EQxJp81KAtpk_X3K_nxVUa0RPRlbt_wdeXXoMoFFpN5BqXXz2HZwKgh_gpK1hjVbsJQHKAbTqWfu8u_LTmYYg4ag==} KNOE_DB_USER = root -KUBECONTEXT = dev -MONITORING_STORAGE_CLASS = local-path -OPENTOFU_URL = http://127.0.0.1:8080 OPTIONAL_WORKLOADS_MIN_READY_SCHEDULABLE_NODES = 2 -PROLE_K3S_SERVER = https://myrddin.knoe.org:6443 +PROLE_K3S_SERVER = https://myrddin.prole.org:6443 PROLE_K3S_TOKEN = ${KNOE_SECRET:v1:-cslrAhG8WhxxJLY:vAx5MGOBcU1NBMjf4U-3y1djMDmwwOjiWkrutxPa4Li5P8RBjCBhEOCEdGP2CiPJJ6UQK-ietX-mu_5nO3yNNjpwDququT4U6lWHPEInSvUNH6ImU-HzPvm_diL2FwJtZm3sY5HgecIy2dwXB_vLnYaA_7VXt9zf0T70rw==} PROLE_OPENTOFU_URL = http://127.0.0.1:8080 -PROTECTED_DB_HOSTS = db.0.knoe.dev,db.knoe.org -PROTECTED_GIT_HOSTS = git.knoe.dev,git.knoe.org -REGISTRY_NAMESPACE = knoe-system SERVICE_NAMESPACE = knoe-system SUPABASE_PV_BASE = /synology/d005 SUPABASE_PV_BASE_DIR = /synology/d005 -SUPABASE_PV_NODE = gandalf.knoe.org -SUPABASE_STUDIO_HOSTNAME = db.0.knoe.dev,db.knoe.org [Welcome] ; No configuration values captured yet for this section. [Dependencies] -STATUS = All installed +; No configuration values captured yet for this section. [Network] -AD_DC_HOST = myrddin.knoe.org -AD_DC_IP = 10.0.0.3 -ANSIBLE_DOMAIN = knoe.org -ANSIBLE_INFRASTRUCTURE = $HOME/dev/knoe/infrastructure -ANSIBLE_INVENTORY = $HOME/dev/knoe/infrastructure/inventory -ANSIBLE_REALM = PROLE.ORG -ANSIBLE_TOPOLOGY = {"domain":"knoe.org","realm":"PROLE.ORG","internal_records":{"aventage.knoe.org":"10.0.0.206","fairyland.knoe.org":"10.0.0.208","loghost.knoe.org":"10.0.0.3","merlin.knoe.org":"10.0.0.6","morana.knoe.org":"10.0.0.66","morgoth.knoe.org":"10.0.0.204","myrddin.knoe.org":"10.0.0.3","pi.knoe.org":"10.0.0.5","raspberry.knoe.org":"10.0.0.4","retropie.knoe.org":"10.0.0.207","synology.knoe.org":"10.0.0.203","zinfandel.knoe.org":"10.0.0.205"},"ad_dc":{"host":"myrddin.knoe.org","ip":"10.0.0.3"},"k3s":{"server_url":"https://myrddin.knoe.org:6443","server_host":"myrddin.knoe.org","token_present":true},"groups":{"iscsi":["pi.knoe.org","raspberry.knoe.org","myrddin.knoe.org","retropie.knoe.org","merlin.knoe.org","gandalf.knoe.org"],"pihole":["pi.knoe.org","raspberry.knoe.org"],"ad_dc":["myrddin.knoe.org"],"k3s_servers":["myrddin.knoe.org"],"k3s_agents":["merlin.knoe.org","gandalf.knoe.org"],"k3s_hosts:children":["k3s_servers","k3s_agents"],"linux_hosts":["pi.knoe.org","raspberry.knoe.org","myrddin.knoe.org","retropie.knoe.org","merlin.knoe.org","gandalf.knoe.org"],"ssl_hosts":["myrddin.knoe.org"],"mariadb_primary":["merlin.knoe.org"],"mariadb_replica":["raspberry.knoe.org"],"mariadb:children":["mariadb_primary","mariadb_replica"],"merlin_bootstrap":["merlin"],"k3s_hosts":["gandalf.knoe.org"]},"hosts":{"merlin":"10.0.0.6","merlin.knoe.org":"10.0.0.6","myrddin.knoe.org":"10.0.0.3","pi.knoe.org":"10.0.0.5","raspberry.knoe.org":"10.0.0.4","retropie.knoe.org":"10.0.0.207"},"unmapped_hosts":["gandalf.knoe.org","k3s_agents","k3s_servers","mariadb_primary","mariadb_replica"]} -KDC_ANSIBLE_DETECTED = 10.0.0.3 -KDC_AUTO_DETECTED = 10.0.0.3 -KERBEROS_AUTO_ENABLED = True +KERBEROS_AUTO_ENABLED = False [Port Forwards] ; No configuration values captured yet for this section. [System Environment] -KNOE_CONF = $HOME/dev/knoe/conf -PROLE_DATA = $HOME/dev/knoe/data -KNOE_HOME = $HOME/dev/knoe -PROLE_LOGS = $HOME/dev/knoe/logs -KNOE_SERVICE = $HOME/dev/knoe/etc +; No configuration values captured yet for this section. [Monitoring] -MONITORING_STORAGE_CLASS = local-path +; No configuration values captured yet for this section. [Kerberos Authentication] ; No configuration values captured yet for this section. [Ollama] -OLLAMA_SERVERS = 10.0.0.208:11434,fairyland.knoe.org:11434,k3d.localhost:11434,morgoth.knoe.org:11434 +; No configuration values captured yet for this section. [Optional Features] -AT_REST_ENCRYPTION_ENABLED = true -GITOPS_ENABLED = True -GITOPS_PROVIDER = GitLab -KERBEROS_ENABLED = true -SUPABASE_ENABLED = false +; No configuration values captured yet for this section. [GitOps] ; No configuration values captured yet for this section. [Database Creation] -APP_CLUSTER_NAME = knoe-dev-0 -DB_CLUSTER_NAME = knoe-cnpg-0 -DB_USER = root +; No configuration values captured yet for this section. [Initialize Cluster] -ENVIRONMENT = dev -K3S_SERVER_URL = https://myrddin.knoe.org:6443 -K3S_TOKEN = ${KNOE_SECRET:v1:ozzcomisjsQYIkSH:Ytp91WR_iP4tJyTAmdH_SRhcKycgzea0zLAgTBNxDsQaBPM-pR_VK3u9wc5QkFzszdAHZGBhVN2HKyqnz-cqDR0WAus88DFbF4zWlgvl6gKEAynaXbdMwAa6vYLUGi8ZE0u1pRiO4KJyiulhBIpfoMReM1Wu6Mj1-20hXw==} +; No configuration values captured yet for this section. [Dev Cluster (k3d)] CLUSTER_ENV = dev DISPLAY_NAME = knoe-dev-cluster -KUBECTL_CONTEXT = dev MODE = k3d [Service Cluster (k3s)] CLUSTER_ENV = knoe-service-cluster DISPLAY_NAME = knoe-service-cluster -K3S_SERVER_URL = https://myrddin.knoe.org:6443 +K3S_SERVER_URL = https://myrddin.prole.org:6443 K3S_TOKEN = ${KNOE_SECRET:v1:-cslrAhG8WhxxJLY:vAx5MGOBcU1NBMjf4U-3y1djMDmwwOjiWkrutxPa4Li5P8RBjCBhEOCEdGP2CiPJJ6UQK-ietX-mu_5nO3yNNjpwDququT4U6lWHPEInSvUNH6ImU-HzPvm_diL2FwJtZm3sY5HgecIy2dwXB_vLnYaA_7VXt9zf0T70rw==} MODE = k3s +PIPELINE_URL = http://127.0.0.1:8080 [GCP] -BILLING_ACCOUNT = 01193C-25783B-3211AD -BILLING_PROJECT = plenary-truck-485623-p7 -ORG_ID = 584001916389 -PROJECT_ID = plenary-truck-485623-p7 +; No configuration values captured yet for this section. [Prod Cluster (k8s)] -ARTIFACTS_DIR = $HOME/dev/knoe/data/staging +ARTIFACTS_DIR = $HOME/dev/knoe-db/data/staging CLUSTER_ENV = knoe-prod-cluster DISPLAY_NAME = knoe-prod-cluster MODE = k8s +PIPELINE_URL = http://127.0.0.1:8080 [Docker Build] -LOCAL_REGISTRY = localhost:5000 -LOCAL_REGISTRY_INTERNAL = k3d-knoe-registry.localhost:5000 +; No configuration values captured yet for this section. [Initialization Scripts] ; No configuration values captured yet for this section. @@ -219,4 +172,4 @@ MODE = k3d TARGET = knoe-dev-cluster [Install] -STATUS = Failed +; No configuration values captured yet for this section. diff --git a/conf/k3s.cfg b/conf/k3s.cfg index 9a2840e..eb7df8e 100644 --- a/conf/k3s.cfg +++ b/conf/k3s.cfg @@ -76,7 +76,7 @@ init_cluster.db_cluster_region = init_cluster.db_cluster_zones = init_cluster.deployment_target = knoe-service-cluster init_cluster.gitops_enabled = true -init_cluster.k3s_server_url = https://myrddin.knoe.org:6443 +init_cluster.k3s_server_url = https://myrddin.prole.org:6443 init_cluster.k3s_token = ${KNOE_SECRET:v1:-cslrAhG8WhxxJLY:vAx5MGOBcU1NBMjf4U-3y1djMDmwwOjiWkrutxPa4Li5P8RBjCBhEOCEdGP2CiPJJ6UQK-ietX-mu_5nO3yNNjpwDququT4U6lWHPEInSvUNH6ImU-HzPvm_diL2FwJtZm3sY5HgecIy2dwXB_vLnYaA_7VXt9zf0T70rw==} init_cluster.kerberos_enabled = true init_cluster.mode = k3s @@ -87,7 +87,7 @@ init_cluster.supabase_enabled = false init_cluster.supabase_meta_enabled = true init_cluster.supabase_realtime_enabled = true init_cluster.supabase_studio_enabled = false -init_cluster.supabase_studio_url = db.0.knoe.dev +init_cluster.supabase_studio_url = db.0.prole.org init_cnpg_deploy.force_rollout = false init_cnpg_deploy.run_deploy = true init_db_build.run_build = true @@ -113,24 +113,24 @@ ollama_config.model = ollama_config.server_host = ollama_config.server_port = 11434 supabase_config.pv_base_dir = /synology/d005 -supabase_config.pv_node = gandalf.knoe.org +supabase_config.pv_node = gandalf.prole.org [Global] ; Variables used by name in more than one place or assumed global scope ARGOCD_NAMESPACE = argocd ARTIFACT_REGISTRY = us-west3-docker.pkg.dev/plenary-truck-485623-p7/knoe-system AUTHORITY_ENABLED = true -AUTH_HOSTNAME = api.knoe.org +AUTH_HOSTNAME = api.prole.org AUTH_LOGIN_PATH = /auth/login AUTH_RESPONSE_HEADERS = X-Knoe-User,X-Knoe-Email,X-Knoe-Groups AUTH_VERIFY_PATH = /auth/verify CLUSTER_ENV = service CLUSTER_NAME = knoe-db -CNPG_ELIGIBLE_NODES = gandalf.knoe.org,merlin.knoe.org,myrddin.knoe.org +CNPG_ELIGIBLE_NODES = gandalf.prole.org,merlin.prole.org,myrddin.prole.org CNPG_PLACEMENT_PLAN_FILE = $HOME/dev/knoe/conf/cnpg-placement/knoe-system-knoe-db.json CNPG_PLACEMENT_PLAN_HASH = 962fb2e7bfd2a48b CNPG_PLACEMENT_PLAN_ID = cnpg-placement-962fb2e7bfd2a48b -CNPG_STAGE1_NODE = gandalf.knoe.org +CNPG_STAGE1_NODE = gandalf.prole.org DATABASE_NAMESPACE = knoe-db DB_HOST_PORT = 5432 DB_PASSWORD = ${KNOE_SECRET:v1:Vc5Sow_MQksbOtOJ:bvD1ABxenFlo0304dhf0Me_nzBX0SvLJ7oFvE_TkHGqc0YF8} @@ -138,30 +138,30 @@ DEPLOYMENT_MODE = k3s DEPLOYMENT_TARGET = knoe-service-cluster DOCKER_IMPORT_DIR = DOCKER_PRELOAD = false -GITEA_HOSTNAME = git-internal.knoe.org -GITLAB_PUBLIC_HOSTS = git.knoe.org +GITEA_HOSTNAME = git-internal.prole.org +GITLAB_PUBLIC_HOSTS = git.prole.org GITLAB_REPAIR_BLOCKED_AUTOCLEAN = 1 -K3S_SERVER = https://myrddin.knoe.org:6443 +K3S_SERVER = https://myrddin.prole.org:6443 K3S_TOKEN = ${KNOE_SECRET:v1:CWWf3RHFdbUrmfrY:It8a2G8QUUIsqVwMsm3LsI4UvSSChEc_uAdESwzYplZLOCiSsCbOKuT9FbPpIwQvEaG_gLz9ZAfkD0EQxJp81KAtpk_X3K_nxVUa0RPRlbt_wdeXXoMoFFpN5BqXXz2HZwKgh_gpK1hjVbsJQHKAbTqWfu8u_LTmYYg4ag==} KNOE_DB_USER = root -KNOE_IMAGE_REGISTRY = registry.knoe.org +KNOE_IMAGE_REGISTRY = registry.prole.org MONITORING_STORAGE_CLASS = local-path OPENTOFU_URL = http://127.0.0.1:8080 OPTIONAL_WORKLOADS_MIN_READY_SCHEDULABLE_NODES = 2 KNOE_HOME = $HOME/dev/knoe -PROLE_K3S_SERVER = https://myrddin.knoe.org:6443 +PROLE_K3S_SERVER = https://myrddin.prole.org:6443 PROLE_K3S_TOKEN = ${KNOE_SECRET:v1:-cslrAhG8WhxxJLY:vAx5MGOBcU1NBMjf4U-3y1djMDmwwOjiWkrutxPa4Li5P8RBjCBhEOCEdGP2CiPJJ6UQK-ietX-mu_5nO3yNNjpwDququT4U6lWHPEInSvUNH6ImU-HzPvm_diL2FwJtZm3sY5HgecIy2dwXB_vLnYaA_7VXt9zf0T70rw==} -PROTECTED_DB_HOSTS = db.knoe.org -PROTECTED_GIT_HOSTS = git.knoe.org +PROTECTED_DB_HOSTS = db.prole.org +PROTECTED_GIT_HOSTS = git.prole.org REDIS_HOST = redis-master.knoe-system.svc.cluster.local REGISTRY_NAMESPACE = knoe-system -SERVICE_HOSTNAME = svc.knoe.org +SERVICE_HOSTNAME = svc.prole.org SERVICE_NAMESPACE = knoe-system -SUPABASE_API_HOSTNAME = supabase.knoe.org +SUPABASE_API_HOSTNAME = supabase.prole.org SUPABASE_PV_BASE = /synology/d005 SUPABASE_PV_BASE_DIR = /synology/d005 -SUPABASE_PV_NODE = gandalf.knoe.org -SUPABASE_STUDIO_HOSTNAME = db.knoe.org +SUPABASE_PV_NODE = gandalf.prole.org +SUPABASE_STUDIO_HOSTNAME = db.prole.org SYNOLOGY_ROOTS = /synology/d001,/synology/d002,/synology/d004,/synology/d005 [Welcome] @@ -171,13 +171,13 @@ SYNOLOGY_ROOTS = /synology/d001,/synology/d002,/synology/d004,/synology/d005 STATUS = All installed [Network] -AD_DC_HOST = myrddin.knoe.org +AD_DC_HOST = myrddin.prole.org AD_DC_IP = 10.0.0.3 -ANSIBLE_DOMAIN = knoe.org +ANSIBLE_DOMAIN = prole.org ANSIBLE_INFRASTRUCTURE = $HOME/dev/knoe/infrastructure ANSIBLE_INVENTORY = $HOME/dev/knoe/infrastructure/inventory ANSIBLE_REALM = PROLE.ORG -ANSIBLE_TOPOLOGY = {"domain":"knoe.org","realm":"PROLE.ORG","internal_records":{"aventage.knoe.org":"10.0.0.206","fairyland.knoe.org":"10.0.0.208","loghost.knoe.org":"10.0.0.3","merlin.knoe.org":"10.0.0.6","morana.knoe.org":"10.0.0.66","morgoth.knoe.org":"10.0.0.204","myrddin.knoe.org":"10.0.0.3","pi.knoe.org":"10.0.0.5","raspberry.knoe.org":"10.0.0.4","retropie.knoe.org":"10.0.0.207","synology.knoe.org":"10.0.0.203","zinfandel.knoe.org":"10.0.0.205"},"ad_dc":{"host":"myrddin.knoe.org","ip":"10.0.0.3"},"k3s":{"server_url":"https://myrddin.knoe.org:6443","server_host":"myrddin.knoe.org","token_present":true},"groups":{"iscsi":["pi.knoe.org","raspberry.knoe.org","myrddin.knoe.org","retropie.knoe.org","merlin.knoe.org","gandalf.knoe.org"],"pihole":["pi.knoe.org","raspberry.knoe.org"],"ad_dc":["myrddin.knoe.org"],"k3s_servers":["myrddin.knoe.org"],"k3s_agents":["merlin.knoe.org","gandalf.knoe.org"],"k3s_hosts:children":["k3s_servers","k3s_agents"],"linux_hosts":["pi.knoe.org","raspberry.knoe.org","myrddin.knoe.org","retropie.knoe.org","merlin.knoe.org","gandalf.knoe.org"],"ssl_hosts":["myrddin.knoe.org"],"mariadb_primary":["merlin.knoe.org"],"mariadb_replica":["raspberry.knoe.org"],"mariadb:children":["mariadb_primary","mariadb_replica"],"merlin_bootstrap":["merlin"],"k3s_hosts":["gandalf.knoe.org"]},"hosts":{"merlin":"10.0.0.6","merlin.knoe.org":"10.0.0.6","myrddin.knoe.org":"10.0.0.3","pi.knoe.org":"10.0.0.5","raspberry.knoe.org":"10.0.0.4","retropie.knoe.org":"10.0.0.207"},"unmapped_hosts":["gandalf.knoe.org","k3s_agents","k3s_servers","mariadb_primary","mariadb_replica"]} +ANSIBLE_TOPOLOGY = {"domain":"prole.org","realm":"PROLE.ORG","internal_records":{"aventage.prole.org":"10.0.0.206","fairyland.prole.org":"10.0.0.208","loghost.prole.org":"10.0.0.3","merlin.prole.org":"10.0.0.6","morana.prole.org":"10.0.0.66","morgoth.prole.org":"10.0.0.204","myrddin.prole.org":"10.0.0.3","pi.prole.org":"10.0.0.5","raspberry.prole.org":"10.0.0.4","retropie.prole.org":"10.0.0.207","synology.prole.org":"10.0.0.203","zinfandel.prole.org":"10.0.0.205"},"ad_dc":{"host":"myrddin.prole.org","ip":"10.0.0.3"},"k3s":{"server_url":"https://myrddin.prole.org:6443","server_host":"myrddin.prole.org","token_present":true},"groups":{"iscsi":["pi.prole.org","raspberry.prole.org","myrddin.prole.org","retropie.prole.org","merlin.prole.org","gandalf.prole.org"],"pihole":["pi.prole.org","raspberry.prole.org"],"ad_dc":["myrddin.prole.org"],"k3s_servers":["myrddin.prole.org"],"k3s_agents":["merlin.prole.org","gandalf.prole.org"],"k3s_hosts:children":["k3s_servers","k3s_agents"],"linux_hosts":["pi.prole.org","raspberry.prole.org","myrddin.prole.org","retropie.prole.org","merlin.prole.org","gandalf.prole.org"],"ssl_hosts":["myrddin.prole.org"],"mariadb_primary":["merlin.prole.org"],"mariadb_replica":["raspberry.prole.org"],"mariadb:children":["mariadb_primary","mariadb_replica"],"merlin_bootstrap":["merlin"],"k3s_hosts":["gandalf.prole.org"]},"hosts":{"merlin":"10.0.0.6","merlin.prole.org":"10.0.0.6","myrddin.prole.org":"10.0.0.3","pi.prole.org":"10.0.0.5","raspberry.prole.org":"10.0.0.4","retropie.prole.org":"10.0.0.207"},"unmapped_hosts":["gandalf.prole.org","k3s_agents","k3s_servers","mariadb_primary","mariadb_replica"]} KDC_ANSIBLE_DETECTED = 10.0.0.3 KDC_AUTO_DETECTED = 10.0.0.3 KERBEROS_AUTO_ENABLED = True @@ -226,7 +226,7 @@ DB_USER = root [Initialize Cluster] ENVIRONMENT = service -K3S_SERVER_URL = https://myrddin.knoe.org:6443 +K3S_SERVER_URL = https://myrddin.prole.org:6443 K3S_TOKEN = ${KNOE_SECRET:v1:-cslrAhG8WhxxJLY:vAx5MGOBcU1NBMjf4U-3y1djMDmwwOjiWkrutxPa4Li5P8RBjCBhEOCEdGP2CiPJJ6UQK-ietX-mu_5nO3yNNjpwDququT4U6lWHPEInSvUNH6ImU-HzPvm_diL2FwJtZm3sY5HgecIy2dwXB_vLnYaA_7VXt9zf0T70rw==} [Dev Cluster (k3d)] @@ -238,7 +238,7 @@ MODE = k3d [Service Cluster (k3s)] CLUSTER_ENV = knoe-service-cluster DISPLAY_NAME = knoe-service-cluster -K3S_SERVER_URL = https://myrddin.knoe.org:6443 +K3S_SERVER_URL = https://myrddin.prole.org:6443 K3S_TOKEN = ${KNOE_SECRET:v1:-cslrAhG8WhxxJLY:vAx5MGOBcU1NBMjf4U-3y1djMDmwwOjiWkrutxPa4Li5P8RBjCBhEOCEdGP2CiPJJ6UQK-ietX-mu_5nO3yNNjpwDququT4U6lWHPEInSvUNH6ImU-HzPvm_diL2FwJtZm3sY5HgecIy2dwXB_vLnYaA_7VXt9zf0T70rw==} KUBECTL_CONTEXT = knoe-service-cluster MODE = k3s diff --git a/deploy.sh b/deploy.sh index d101a47..84bfdc4 100755 --- a/deploy.sh +++ b/deploy.sh @@ -132,7 +132,7 @@ def get_runtime_config(path): gitlab_public_hosts_raw = _cfg_first(g, e, i, "GITLAB_PUBLIC_HOSTS", "gitlab_public_hosts") gitlab_domain = _cfg_first(g, e, i, "GITLAB_DOMAIN", "GITLAB_HOSTNAME", "gitlab_domain", "gitlab_hostname") if not gitlab_domain: - gitlab_domain = "git.knoe.dev" if mode == "k8s" else "git.knoe.org" + gitlab_domain = "git.knoe.dev" if mode == "k8s" else "git.prole.org" gitlab_public_hosts = [h.strip() for h in str(gitlab_public_hosts_raw or "").split(",") if h.strip()] if not gitlab_public_hosts: gitlab_public_hosts = [gitlab_domain] @@ -145,11 +145,11 @@ def get_runtime_config(path): auth_host = _cfg_first(g, e, i, "AUTH_HOSTNAME", "auth_hostname") if not auth_host: - auth_host = "api.knoe.dev" if mode == "k8s" else "api.knoe.org" + auth_host = "api.knoe.dev" if mode == "k8s" else "api.prole.org" service_host = _cfg_first(g, e, i, "SERVICE_HOSTNAME", "service_hostname", "GRAFANA_HOSTNAME", "grafana_hostname") if not service_host: - service_host = "svc.knoe.dev" if mode == "k8s" else "svc.knoe.org" + service_host = "svc.knoe.dev" if mode == "k8s" else "svc.prole.org" service_ns = _cfg_first(g, e, i, "SERVICE_NAMESPACE", "service_namespace") or "knoe-system" diff --git a/deploy/opentofu/k3s/manifests/knoe/garage-statefulset.yaml b/deploy/opentofu/k3s/manifests/knoe/garage-statefulset.yaml index c34477d..7566deb 100644 --- a/deploy/opentofu/k3s/manifests/knoe/garage-statefulset.yaml +++ b/deploy/opentofu/k3s/manifests/knoe/garage-statefulset.yaml @@ -16,7 +16,7 @@ spec: app: garage spec: nodeSelector: - kubernetes.io/hostname: myrddin.knoe.org + kubernetes.io/hostname: myrddin.prole.org containers: - name: garage image: dxflrs/garage:v1.3.1 diff --git a/deploy/opentofu/k3s/manifests/opentofu/deployment.yaml b/deploy/opentofu/k3s/manifests/opentofu/deployment.yaml index 27f789f..15c222f 100644 --- a/deploy/opentofu/k3s/manifests/opentofu/deployment.yaml +++ b/deploy/opentofu/k3s/manifests/opentofu/deployment.yaml @@ -56,7 +56,7 @@ spec: app: opentofu spec: nodeSelector: - kubernetes.io/hostname: myrddin.knoe.org + kubernetes.io/hostname: myrddin.prole.org containers: - name: opentofu-ui image: nginx:1.27-alpine