From 5a926797557d7ef5042ea47b5b7e1e51768f4d40 Mon Sep 17 00:00:00 2001
From: Peter Kurfer <peter.kurfer@googlemail.com>
Date: Tue, 20 Sep 2022 22:11:42 +0200
Subject: [PATCH] feat: upgrade to latest main version

---
 k8s/inventory/clusters.yaml                   |  2 +-
 k8s/inventory/group_vars/all.yml              | 56 ++++++++++---------
 .../agola/templates/all-deployment.yml.j2     |  5 +-
 k8s/roles/agola/templates/config.yml.j2       | 18 +++---
 .../rbac/agola-deploy-rolebinding.yml.j2      |  2 +-
 5 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/k8s/inventory/clusters.yaml b/k8s/inventory/clusters.yaml
index 21ed770..b7a6167 100644
--- a/k8s/inventory/clusters.yaml
+++ b/k8s/inventory/clusters.yaml
@@ -8,7 +8,7 @@ all:
     systemd_dir: /etc/systemd/system
     master_ip: "172.23.2.10"
     domain: icb4dc0.de
-    agola_image: docker.io/sorintlab/agola:v0.7.0
+    agola_image: code.icb4dc0.de/prskr/agola:latest
   children:
     control_plane:
       hosts:
diff --git a/k8s/inventory/group_vars/all.yml b/k8s/inventory/group_vars/all.yml
index eb780d7..c439a08 100644
--- a/k8s/inventory/group_vars/all.yml
+++ b/k8s/inventory/group_vars/all.yml
@@ -1,28 +1,30 @@
 $ANSIBLE_VAULT;1.1;AES256
-62336464623834373037373035346466366536643133656330613533613739323833313936366130
-3862346331393636353034343363323164366434303063360a363164346638326163373332333438
-61326566386530643830353934366232386636663133346632633866336665383331636266356434
-6466656238326364310a316136613737663761653563616437396661623662616538633937323231
-62616665613335333632633133663536626237386539646635613031643830633235623661373735
-33646532613234373535356532386465303733356261303362316237303633363231313666613464
-62366666626231623439333432353832313463346431653763383935333534323234356530613736
-62306462616232393164333137663961303532316234336339353830646333666334663936356530
-38363136663865333232643330326163623266353766613438626433303331323733303664366631
-65653263666333373532393764376632613230373035643131303939623461363435643932336136
-33663439643866333765623733396334313666383237653839303037643134313066336337396537
-34623933336165333063373062626237656132316337646237346637346331303239353136623431
-63383837623531306566376665643363626435653537376131303735343736323338333438353937
-39633138306564376463366463383738343438393033343337353932306132383064633236336166
-37663537653130366634636537626462666231363465623834643032396534323238383365653638
-35323537303437356663333838316633353964333230633038643230613833633333363661326132
-32663136333132393436383338313837623139316238666136626338616135383131353430306662
-38366266373864623437666263663665653061616266386539623435346435383735313830306432
-32363936343830306432656263613339356363373961623635666337376166306666353232626531
-33376237633263356538356133613532663536643731393562616161643864383166636364326539
-66373266326530306565383031383835623966646331653937333231643961656461323063313137
-31386634326265343832393365306138623937616332626233656266306562323636616637363238
-30366238633265663465663436613030656231343139333066656231646462346230306134626462
-33373339366331343761373238643137636430643830323638396465636536386363663132333461
-66383466373839616165306131383331396362333865383635313433343962646532313536393430
-34373263313830616663613435343838356366313161313938633032396338656331616135336633
-326132356566613361383664663334363535
+65396238393462613261383234303135363964363061333935366436353835386363633832613366
+3964333432376334626565323837386531666233366535620a356431353838633662333233636462
+30323161303835323463653034386461366335646236343831633130633435306639623462363935
+6466633038616138330a366638373937386264353334326161363761313262623035363266393538
+34396338666232353239313832643964306235643134383833386161663962303130313866316565
+62393536316332613234353261323366346133383133643237333131333932306637636264633730
+39373236353230356231343838633964396439663036326462646430313666623336646435613035
+63663036393734383732393466346339393134383032326433366438653738623162336565663464
+63373932613430323931643937656534323934613564333861613030346333343932353037336134
+63303834373062373739626533623836393234393262613737663839353239396637616562636431
+64353331663937353535363661623935363039373633656263383638653738373938313930323066
+62376331656362343464393138613031393136653161393530643534623362343562316234393662
+32613964343439633038383536653934353030656165623434646631323837613362633864336266
+31353062643236633830626461373335366364313837633963633061636334386261326561393331
+36363330383636376131336335623535363664366662353066346632656637646638386132383936
+38646433626562333764356431383766623634623764643930396137623030373331386663306238
+32313030326634613664373835333162313135643832623335343262613933316365613038366263
+35363034386366323166313530613962383962646238643134636131613463393837376636363065
+30383063356433633163666165396537653663346566363065613963373762353439626639303366
+66616633313166656434653734393432396631646237353434663336663233396364326430353437
+38663736366332353362373666653364313832646662653239336332373631373064356436613239
+30666135393437383862633330343338316238656262613866343762336462333439326561376162
+65376635653037366431313166383031666434393032666636333130366330663630306631623939
+39636332393765396239613766366339363461386635373935343034643639366439616462376435
+62636336363330373637636434323237313537656630663865653663363332336230366465663536
+32323230373130633736626233373564656533343437376562356636303039393461623033323537
+35633732613837663534373664346263653163386566633438653031303631663834306561626661
+33376630346563646239376462363839373665663331636134643362306262323334626164326130
+34643737373333363363663138343539376161323939656561643936663065623861
diff --git a/k8s/roles/agola/templates/all-deployment.yml.j2 b/k8s/roles/agola/templates/all-deployment.yml.j2
index e66cdaa..cf2e0d5 100644
--- a/k8s/roles/agola/templates/all-deployment.yml.j2
+++ b/k8s/roles/agola/templates/all-deployment.yml.j2
@@ -18,6 +18,8 @@ spec:
         app: agola
     spec:
       serviceAccountName: agola
+      imagePullSecrets:
+        - name: gitea-pull-secret
       containers:
         - name: agola
           image: {{ agola_image }}
@@ -29,9 +31,6 @@ spec:
             - "--components"
             - all-base,executor
             - "--detailed-errors"
-            - "--embedded-etcd"
-            - "--embedded-etcd-data-dir"
-            - "/mnt/agola/data/etcd"
           env:
           ports:
             - containerPort: 8000
diff --git a/k8s/roles/agola/templates/config.yml.j2 b/k8s/roles/agola/templates/config.yml.j2
index 14d2e35..2c777ca 100644
--- a/k8s/roles/agola/templates/config.yml.j2
+++ b/k8s/roles/agola/templates/config.yml.j2
@@ -34,16 +34,16 @@ stringData:
       configstoreURL: "http://agola-internal:4002"
       db:
         # example with a postgres db
-        type: sqlite3
-        # 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"
+        type: postgres
+        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"
     configstore:
       dataDir: /mnt/agola/local/configstore
       db:
         # example with a postgres db
-        type: sqlite
-        # 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"
+        type: postgres
+        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"
       objectStorage:
         type: s3
         endpoint: "http://minio.minio.svc.cluster.local:9000"
@@ -56,9 +56,9 @@ stringData:
       # debug: true
       dataDir: /mnt/agola/local/runservice
       db:
-        type: sqlite
-        # 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"
+        type: postgres
+        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"
       objectStorage:
         type: s3
         # example with minio
diff --git a/k8s/roles/agola/templates/rbac/agola-deploy-rolebinding.yml.j2 b/k8s/roles/agola/templates/rbac/agola-deploy-rolebinding.yml.j2
index 16890d3..4c5f5a6 100644
--- a/k8s/roles/agola/templates/rbac/agola-deploy-rolebinding.yml.j2
+++ b/k8s/roles/agola/templates/rbac/agola-deploy-rolebinding.yml.j2
@@ -6,7 +6,7 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: agola-agola
+  name: agola-deploy
 subjects:
 - kind: ServiceAccount
   name: agola