From 32e1ad0bd73f0754c0978c96eaee526fa841ddb4 Mon Sep 17 00:00:00 2001 From: zramsay Date: Thu, 6 Jun 2024 19:03:16 -0400 Subject: [PATCH] lx -> rnt --- ...-dns.yaml => secret-digitalocean-dns.yaml} | 0 ....yaml => wildcard-pwa-realitynetwork.yaml} | 10 +++++----- group_vars/all/nginx-vault.yml | 12 +++++------ group_vars/lx_cad/k8s-vault.yml | 8 -------- group_vars/rnt_cad/k8s-vault.yml | 20 +++++++++++++++++++ group_vars/{lx_cad => rnt_cad}/k8s.yml | 13 ++++-------- .../firewalld.yml | 4 ++-- .../firewalld.yml | 4 ++-- .../{lx-daemon => rnt-daemon}/firewalld.yml | 4 ++-- host_vars/{lx-daemon => rnt-daemon}/nginx.yml | 10 +++++----- hosts | 17 +++++++++------- 11 files changed, 56 insertions(+), 46 deletions(-) rename files/manifests/{digitalocean-dns.yaml => secret-digitalocean-dns.yaml} (100%) rename files/manifests/{wildcard-pwa-audubon.yaml => wildcard-pwa-realitynetwork.yaml} (51%) delete mode 100644 group_vars/lx_cad/k8s-vault.yml create mode 100644 group_vars/rnt_cad/k8s-vault.yml rename group_vars/{lx_cad => rnt_cad}/k8s.yml (77%) rename host_vars/{lx-cad-cluster-worker => rnt-cad-cluster-control}/firewalld.yml (77%) rename host_vars/{lx-cad-cluster-control => rnt-cad-cluster-worker}/firewalld.yml (77%) rename host_vars/{lx-daemon => rnt-daemon}/firewalld.yml (79%) rename host_vars/{lx-daemon => rnt-daemon}/nginx.yml (61%) diff --git a/files/manifests/digitalocean-dns.yaml b/files/manifests/secret-digitalocean-dns.yaml similarity index 100% rename from files/manifests/digitalocean-dns.yaml rename to files/manifests/secret-digitalocean-dns.yaml diff --git a/files/manifests/wildcard-pwa-audubon.yaml b/files/manifests/wildcard-pwa-realitynetwork.yaml similarity index 51% rename from files/manifests/wildcard-pwa-audubon.yaml rename to files/manifests/wildcard-pwa-realitynetwork.yaml index b048501..3af5555 100644 --- a/files/manifests/wildcard-pwa-audubon.yaml +++ b/files/manifests/wildcard-pwa-realitynetwork.yaml @@ -1,15 +1,15 @@ apiVersion: cert-manager.io/v1 kind: Certificate metadata: - name: pwa.audubon.app + name: pwa.realitynetwork.store namespace: default spec: - secretName: pwa.audubon.app + secretName: pwa.realitynetwork.store issuerRef: name: letsencrypt-prod-wild kind: ClusterIssuer group: cert-manager.io - commonName: "*.pwa.audubon.app" + commonName: "*.pwa.realitynetwork.store" dnsNames: - - ".pwa.audubon.app" - - "*.pwa.audubon.app" + - ".pwa.realitynetwork.store" + - "*.pwa.realitynetwork.store" diff --git a/group_vars/all/nginx-vault.yml b/group_vars/all/nginx-vault.yml index 9bad4e6..0d2315b 100644 --- a/group_vars/all/nginx-vault.yml +++ b/group_vars/all/nginx-vault.yml @@ -1,7 +1,7 @@ $ANSIBLE_VAULT;1.1;AES256 -61643936333265303166353936373164393663353565343136313838663932646663653165393262 -3435356136353463633330333861666638613831306439350a636462346339343465343864363233 -63643831653462383462623639653439336239313831383333326135303662363830326235396666 -3164653535666539390a356133333438306332383537616331336138333161643361393462653037 -32626534346339303662643138336639646530626561393834303663626464646364616433633263 -3233303765316363373061376262366239633864353437383136 +35653636336237396562396164356135326631346265313730326539346433633938313834646638 +6337303663623337343962626261373730633865656637350a323939333230306133323561343331 +37333236626533383663306339626234333338316663386631376332646665326234343835306163 +3238343337326435370a303935316662306234633430623939343937343133643265373561373532 +62313762613763653037346636653566336338666264313063663639366235636265333032303331 +6130346538373361363465646638353163643034663463333230 diff --git a/group_vars/lx_cad/k8s-vault.yml b/group_vars/lx_cad/k8s-vault.yml deleted file mode 100644 index f939c98..0000000 --- a/group_vars/lx_cad/k8s-vault.yml +++ /dev/null @@ -1,8 +0,0 @@ -$ANSIBLE_VAULT;1.1;AES256 -35636161616230343863626538626535303366383363623336636166343331626664326230626661 -3937353665346130663263653132393634333736343962610a343732303062353436636232653731 -65393839356235336434343038373530313136306563656633346561633839656238613838616634 -3537363938303830340a373435396561656433303632366132343765323139653930316531356337 -39353865386535633339306537646465336438353030616631326136636138336332373965646439 -65666530666263326165653162373633306139613266616364616435626138666433326365333334 -333662376231636163356430636438656565 diff --git a/group_vars/rnt_cad/k8s-vault.yml b/group_vars/rnt_cad/k8s-vault.yml new file mode 100644 index 0000000..da672b1 --- /dev/null +++ b/group_vars/rnt_cad/k8s-vault.yml @@ -0,0 +1,20 @@ +$ANSIBLE_VAULT;1.1;AES256 +31353233643237366465646130336561386438373734613831366363646233363162653832366633 +6636313161316536313230623835336565303633656439650a653963363861366162383763356562 +33326666346663353636363537663830353238333932636562333035646137663965386531366562 +3038353238623663630a613336643965366531633561353630323361336665646665353663626335 +36383133353862626162646336636662323361356665323833666661666166366534383433626662 +32613631633133643464633330303431396564636266393739616634313666386138323466373163 +37333230636636373266383733383938616338356663373531663634626666343837353864353136 +65393566396634356262346666623930366633313833343531326132373632633263383633636363 +33343934663564363234646138653462303265396633326463343332366331363132353862316432 +37353662653939356136306134623339616632383764616433653935643131653161653562316136 +30323130616366323361653363346161343064333064313738623139386561376564663439356662 +65386438623734613638643062613639316639663461393933353134376465373432653066336561 +38613265376263326139636265396565616435626430303632393134333466633035623363663330 +34663462363138626537316464306134303266326133646663613530303533316563633534363362 +63656436363566353433323665333935656436643166313233663334356333623365373233643132 +36623665323065353362343362353533336664663564656239366430373633366465336161333832 +65386136666261303430373265323231613263646461343436393931373435336263383331386234 +32656537623934386561353762396638366462363463326433623661363738656135376231633835 +376236376232343263646338343265663261 diff --git a/group_vars/lx_cad/k8s.yml b/group_vars/rnt_cad/k8s.yml similarity index 77% rename from group_vars/lx_cad/k8s.yml rename to group_vars/rnt_cad/k8s.yml index 3d0ae10..66d744b 100644 --- a/group_vars/lx_cad/k8s.yml +++ b/group_vars/rnt_cad/k8s.yml @@ -1,6 +1,6 @@ --- -k8s_cluster_name: lx-cad -k8s_cluster_url: lx-cad-cluster-control.audubon.app +k8s_cluster_name: default +k8s_cluster_url: rnt-cad-cluster-control.realitynetwork.store k8s_taint_servers: true k8s_manifests: @@ -29,11 +29,6 @@ k8s_manifests: secret_key: access-token # initiate wildcard cert - - name: pwa.audubon.app + - name: pwa.realitynetwork.store type: file - source: wildcard-pwa-audubon.yaml - -k8s_secrets: - - name: digitalocean-dns - type: file - source: secret-digitalocean-dns.yaml + source: wildcard-pwa-realitynetwork.yaml diff --git a/host_vars/lx-cad-cluster-worker/firewalld.yml b/host_vars/rnt-cad-cluster-control/firewalld.yml similarity index 77% rename from host_vars/lx-cad-cluster-worker/firewalld.yml rename to host_vars/rnt-cad-cluster-control/firewalld.yml index 71af218..50074a4 100644 --- a/host_vars/lx-cad-cluster-worker/firewalld.yml +++ b/host_vars/rnt-cad-cluster-control/firewalld.yml @@ -11,5 +11,5 @@ firewalld_add: sources: - 10.42.0.0/16 - 10.43.0.0/16 - - 23.111.78.179/32 - - 23.111.69.218/32 + - 138.197.165.217/32 + - 134.122.38.203/32 diff --git a/host_vars/lx-cad-cluster-control/firewalld.yml b/host_vars/rnt-cad-cluster-worker/firewalld.yml similarity index 77% rename from host_vars/lx-cad-cluster-control/firewalld.yml rename to host_vars/rnt-cad-cluster-worker/firewalld.yml index eb0aeed..fa20041 100644 --- a/host_vars/lx-cad-cluster-control/firewalld.yml +++ b/host_vars/rnt-cad-cluster-worker/firewalld.yml @@ -11,5 +11,5 @@ firewalld_add: sources: - 10.42.0.0/16 - 10.43.0.0/16 - - 23.111.78.182/32 - - 23.111.69.218/32 + - 159.203.61.139/32 + - 134.122.38.203/32 diff --git a/host_vars/lx-daemon/firewalld.yml b/host_vars/rnt-daemon/firewalld.yml similarity index 79% rename from host_vars/lx-daemon/firewalld.yml rename to host_vars/rnt-daemon/firewalld.yml index 62c4493..29cf80c 100644 --- a/host_vars/lx-daemon/firewalld.yml +++ b/host_vars/rnt-daemon/firewalld.yml @@ -13,5 +13,5 @@ firewalld_add: - name: trusted sources: - - 23.111.78.179/32 - - 23.111.78.182/32 + - 159.203.61.139/32 + - 138.197.165.217/32 diff --git a/host_vars/lx-daemon/nginx.yml b/host_vars/rnt-daemon/nginx.yml similarity index 61% rename from host_vars/lx-daemon/nginx.yml rename to host_vars/rnt-daemon/nginx.yml index 0557caf..42dd959 100644 --- a/host_vars/lx-daemon/nginx.yml +++ b/host_vars/rnt-daemon/nginx.yml @@ -6,16 +6,16 @@ nginx_proxy_send_timeout: 1200 nginx_proxy_connection_timeout: 75 nginx_sites: - - name: lx-console - url: lx-console.audubon.app + - name: rnt-console + url: rnt-console.realitynetwork.store upstream: http://localhost:8080 template: basic-proxy ssl: true - - name: lx-daemon - url: lx-daemon.audubon.app + - name: rnt-daemon + url: rnt-daemon.realitynetwork.store upstream: http://localhost:9473 configs: - - rewrite ^/deployer(/.*)? https://webapp-deployer.pwa.audubon.app permanent + - rewrite ^/deployer(/.*)? https://webapp-deployer.pwa.realitynetwork.store permanent template: websocket-proxy ssl: true diff --git a/hosts b/hosts index 174990d..569ee6b 100644 --- a/hosts +++ b/hosts @@ -1,11 +1,14 @@ [all] -lx-daemon ansible_host= -lx-cad-cluster-control ansible_host= -lx-cad-cluster-worker ansible_host= +rnt-daemon ansible_host=134.122.38.203 +rnt-cad-cluster-control ansible_host=159.203.61.139 +rnt-cad-cluster-worker ansible_host=138.197.165.217 [so] -lx-daemon +rnt-daemon -[lx_cad] -lx-cad-cluster-control k8s_node_type=bootstrap -lx-cad-cluster-worker k8s_node_type=agent k8s_pod_limit=1024 k8s_external_ip= +[rnt_cad] +rnt-cad-cluster-control k8s_node_type=bootstrap +rnt-cad-cluster-worker k8s_node_type=agent k8s_pod_limit=1024 k8s_external_ip=138.197.165.217 + +[k8s:children] +rnt_cad