From 2803e49ed0a687257e871479394126feab764f19 Mon Sep 17 00:00:00 2001 From: srw Date: Fri, 7 Jun 2024 02:26:14 +0000 Subject: [PATCH] add generic support_email var shared by nginx and k8s, fix old manifest syntax --- group_vars/all/nginx-vault.yml | 7 ------ group_vars/all/nginx.yml | 2 ++ group_vars/all/vault.yml | 7 ++++++ group_vars/rnt_cad/k8s-vault.yml | 38 ++++++++++++++++---------------- group_vars/rnt_cad/k8s.yml | 5 ++++- 5 files changed, 32 insertions(+), 27 deletions(-) delete mode 100644 group_vars/all/nginx-vault.yml create mode 100644 group_vars/all/nginx.yml create mode 100644 group_vars/all/vault.yml diff --git a/group_vars/all/nginx-vault.yml b/group_vars/all/nginx-vault.yml deleted file mode 100644 index 0d2315b..0000000 --- a/group_vars/all/nginx-vault.yml +++ /dev/null @@ -1,7 +0,0 @@ -$ANSIBLE_VAULT;1.1;AES256 -35653636336237396562396164356135326631346265313730326539346433633938313834646638 -6337303663623337343962626261373730633865656637350a323939333230306133323561343331 -37333236626533383663306339626234333338316663386631376332646665326234343835306163 -3238343337326435370a303935316662306234633430623939343937343133643265373561373532 -62313762613763653037346636653566336338666264313063663639366235636265333032303331 -6130346538373361363465646638353163643034663463333230 diff --git a/group_vars/all/nginx.yml b/group_vars/all/nginx.yml new file mode 100644 index 0000000..4a55b1a --- /dev/null +++ b/group_vars/all/nginx.yml @@ -0,0 +1,2 @@ +--- +nginx_ssl_email: "{{ support_email }}" \ No newline at end of file diff --git a/group_vars/all/vault.yml b/group_vars/all/vault.yml new file mode 100644 index 0000000..73a890e --- /dev/null +++ b/group_vars/all/vault.yml @@ -0,0 +1,7 @@ +$ANSIBLE_VAULT;1.1;AES256 +35636534633536663965623866666430613934363036343661343362346534353764326662396365 +3039363533323464353932373436356362353261343836620a616132336266346238336338653434 +35616334333832356134353466623333363235373066396663363839656663326666323164393265 +6338323565323936350a356136353231613765366531366431363864356565653938613963656233 +66613965396531636331353463333436376337363932393033303937383263336637663435373262 +3361356561306233303030313438363637343433356463626536 diff --git a/group_vars/rnt_cad/k8s-vault.yml b/group_vars/rnt_cad/k8s-vault.yml index da672b1..266542f 100644 --- a/group_vars/rnt_cad/k8s-vault.yml +++ b/group_vars/rnt_cad/k8s-vault.yml @@ -1,20 +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 +65653439356463666638636338623462306433326133643435376135336234663664373730353666 +3261643463653963383639323862643236666233666334360a373063303765393535646466363238 +64616132396466383065366436656639363662656662343266376264656335373666323937613463 +6166613263343232300a633332356564313335363536623730343830613364396530633435366231 +30326339333035623161663964373961626333623132356665643837316463636437356637376633 +36623632653137316263333032623235363633333736393866343036626535353232383334626330 +35643737396531366238633832396234393661616439633239303836396536643332303531386466 +61383962363065373763316238643935353065303364373732303762343036623663383630313231 +63336636636539303632333932326662376635363462633639636165623066313764353638353064 +66353431643036633763383238343330633730653461396336643866393263386265613863666439 +62356433363031383234353231666162333361303535343333323964323330313739373639613361 +33303034646637616133313730653765303038653836633965616132613262353134613563313164 +65666538353035353538306433656234393737306166633565646166623935643164613161306137 +38373039316133326539333162616661633439333564396136313932303133393561613766396137 +37363730616339386430373966313838626634633662386630306566353165386664396437323031 +38666161313763663033303032316433643964636162613461333833333762616166653666333433 +37653161666261623461326531323366383361353561373564663636616262393462366563613037 +39353135313139613436366238656461626437363437373763333839363862316339376435616339 +336135323537316538613461663139386363 diff --git a/group_vars/rnt_cad/k8s.yml b/group_vars/rnt_cad/k8s.yml index 66d744b..3cf85c0 100644 --- a/group_vars/rnt_cad/k8s.yml +++ b/group_vars/rnt_cad/k8s.yml @@ -3,9 +3,12 @@ k8s_cluster_name: default k8s_cluster_url: rnt-cad-cluster-control.realitynetwork.store k8s_taint_servers: true +k8s_acme_email: "{{ support_email }}" + k8s_manifests: - name: cert-manager - url: https://github.com/cert-manager/cert-manager/releases/download/v1.14.5/cert-manager.yaml + type: url + source: https://github.com/cert-manager/cert-manager/releases/download/v1.15.0/cert-manager.yaml # issuer for basic http certs - name: letsencrypt-prod