prskr/infrastructure
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat: upgrade to latest main version

Browse source
This commit is contained in:
Peter 2022-09-20 22:11:42 +02:00
parent 9ba06c4efc
commit 5a92679755
Signed by: prskr
GPG key ID: C1DB5D2E8DB512F9
5 changed files with 42 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
k8s/inventory/clusters.yaml
View file

@ -8,7 +8,7 @@ all:
systemd_dir: /etc/systemd/system systemd_dir: /etc/systemd/system
master_ip: "172.23.2.10" master_ip: "172.23.2.10"
domain: icb4dc0.de domain: icb4dc0.de
agola_image: docker.io/sorintlab/agola:v0.7.0 agola_image: code.icb4dc0.de/prskr/agola:latest
children: children:
control_plane: control_plane:
hosts: hosts:

56
k8s/inventory/group_vars/all.yml
View file

@ -1,28 +1,30 @@
$ANSIBLE_VAULT;1.1;AES256 $ANSIBLE_VAULT;1.1;AES256
62336464623834373037373035346466366536643133656330613533613739323833313936366130 65396238393462613261383234303135363964363061333935366436353835386363633832613366
3862346331393636353034343363323164366434303063360a363164346638326163373332333438 3964333432376334626565323837386531666233366535620a356431353838633662333233636462
61326566386530643830353934366232386636663133346632633866336665383331636266356434 30323161303835323463653034386461366335646236343831633130633435306639623462363935
6466656238326364310a316136613737663761653563616437396661623662616538633937323231 6466633038616138330a366638373937386264353334326161363761313262623035363266393538
62616665613335333632633133663536626237386539646635613031643830633235623661373735 34396338666232353239313832643964306235643134383833386161663962303130313866316565
33646532613234373535356532386465303733356261303362316237303633363231313666613464 62393536316332613234353261323366346133383133643237333131333932306637636264633730
62366666626231623439333432353832313463346431653763383935333534323234356530613736 39373236353230356231343838633964396439663036326462646430313666623336646435613035
62306462616232393164333137663961303532316234336339353830646333666334663936356530 63663036393734383732393466346339393134383032326433366438653738623162336565663464
38363136663865333232643330326163623266353766613438626433303331323733303664366631 63373932613430323931643937656534323934613564333861613030346333343932353037336134
65653263666333373532393764376632613230373035643131303939623461363435643932336136 63303834373062373739626533623836393234393262613737663839353239396637616562636431
33663439643866333765623733396334313666383237653839303037643134313066336337396537 64353331663937353535363661623935363039373633656263383638653738373938313930323066
34623933336165333063373062626237656132316337646237346637346331303239353136623431 62376331656362343464393138613031393136653161393530643534623362343562316234393662
63383837623531306566376665643363626435653537376131303735343736323338333438353937 32613964343439633038383536653934353030656165623434646631323837613362633864336266
39633138306564376463366463383738343438393033343337353932306132383064633236336166 31353062643236633830626461373335366364313837633963633061636334386261326561393331
37663537653130366634636537626462666231363465623834643032396534323238383365653638 36363330383636376131336335623535363664366662353066346632656637646638386132383936
35323537303437356663333838316633353964333230633038643230613833633333363661326132 38646433626562333764356431383766623634623764643930396137623030373331386663306238
32663136333132393436383338313837623139316238666136626338616135383131353430306662 32313030326634613664373835333162313135643832623335343262613933316365613038366263
38366266373864623437666263663665653061616266386539623435346435383735313830306432 35363034386366323166313530613962383962646238643134636131613463393837376636363065
32363936343830306432656263613339356363373961623635666337376166306666353232626531 30383063356433633163666165396537653663346566363065613963373762353439626639303366
33376237633263356538356133613532663536643731393562616161643864383166636364326539 66616633313166656434653734393432396631646237353434663336663233396364326430353437
66373266326530306565383031383835623966646331653937333231643961656461323063313137 38663736366332353362373666653364313832646662653239336332373631373064356436613239
31386634326265343832393365306138623937616332626233656266306562323636616637363238 30666135393437383862633330343338316238656262613866343762336462333439326561376162
30366238633265663465663436613030656231343139333066656231646462346230306134626462 65376635653037366431313166383031666434393032666636333130366330663630306631623939
33373339366331343761373238643137636430643830323638396465636536386363663132333461 39636332393765396239613766366339363461386635373935343034643639366439616462376435
66383466373839616165306131383331396362333865383635313433343962646532313536393430 62636336363330373637636434323237313537656630663865653663363332336230366465663536
34373263313830616663613435343838356366313161313938633032396338656331616135336633 32323230373130633736626233373564656533343437376562356636303039393461623033323537
326132356566613361383664663334363535 35633732613837663534373664346263653163386566633438653031303631663834306561626661
33376630346563646239376462363839373665663331636134643362306262323334626164326130
34643737373333363363663138343539376161323939656561643936663065623861

5
k8s/roles/agola/templates/all-deployment.yml.j2
View file

@ -18,6 +18,8 @@ spec:
app: agola app: agola
spec: spec:
serviceAccountName: agola serviceAccountName: agola
imagePullSecrets:
- name: gitea-pull-secret
containers: containers:
- name: agola - name: agola
image: {{ agola_image }} image: {{ agola_image }}
@ -29,9 +31,6 @@ spec:
- "--components" - "--components"
- all-base,executor - all-base,executor
- "--detailed-errors" - "--detailed-errors"
- "--embedded-etcd"
- "--embedded-etcd-data-dir"
- "/mnt/agola/data/etcd"
env: env:
ports: ports:
- containerPort: 8000 - containerPort: 8000

18
k8s/roles/agola/templates/config.yml.j2
View file

@ -34,16 +34,16 @@ stringData:
configstoreURL: "http://agola-internal:4002" configstoreURL: "http://agola-internal:4002"
db: db:
# example with a postgres db # example with a postgres db
type: sqlite3 type: postgres
# connString: "postgres://{{ agola.dbUser }}:{{ agola.dbPassword }}@default-postgres-postgresql.postgres.svc.cluster.local:5432/agola_notification?sslmode=disable" connString: "postgres://{{ agola.dbUser }}:{{ agola.dbPassword }}@default-postgres-postgresql.postgres.svc.cluster.local:5432/agola_notification?sslmode=disable"
connString: "/opt/agola/notification/db/db.db" # connString: "/opt/agola/notification/db/db.db"
configstore: configstore:
dataDir: /mnt/agola/local/configstore dataDir: /mnt/agola/local/configstore
db: db:
# example with a postgres db # example with a postgres db
type: sqlite type: postgres
# connString: "postgres://{{ agola.dbUser }}:{{ agola.dbPassword }}@default-postgres-postgresql.postgres.svc.cluster.local:5432/agola_configstore?sslmode=disable" connString: "postgres://{{ agola.dbUser }}:{{ agola.dbPassword }}@default-postgres-postgresql.postgres.svc.cluster.local:5432/agola_configstore?sslmode=disable"
connString: "/opt/agola/configstore/db/db.db" # connString: "/opt/agola/configstore/db/db.db"
objectStorage: objectStorage:
type: s3 type: s3
endpoint: "http://minio.minio.svc.cluster.local:9000" endpoint: "http://minio.minio.svc.cluster.local:9000"
@ -56,9 +56,9 @@ stringData:
# debug: true # debug: true
dataDir: /mnt/agola/local/runservice dataDir: /mnt/agola/local/runservice
db: db:
type: sqlite type: postgres
# connString: "postgres://{{ agola.dbUser }}:{{ agola.dbPassword }}@default-postgres-postgresql.postgres.svc.cluster.local:5432/agola_runservice?sslmode=disable" connString: "postgres://{{ agola.dbUser }}:{{ agola.dbPassword }}@default-postgres-postgresql.postgres.svc.cluster.local:5432/agola_runservice?sslmode=disable"
connString: "/opt/agola/runservice/db/db.db" # connString: "/opt/agola/runservice/db/db.db"
objectStorage: objectStorage:
type: s3 type: s3
# example with minio # example with minio

2
k8s/roles/agola/templates/rbac/agola-deploy-rolebinding.yml.j2
View file

@ -6,7 +6,7 @@ metadata:
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
kind: ClusterRole kind: ClusterRole
name: agola-agola name: agola-deploy
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: agola name: agola