vynil/domain
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Sébastien Huss
2024-04-22 13:25:20 +02:00
parent a3a4506638
commit 18bd380e3b
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
share/gitea-tekton-org/tekton.dev_v1_Pipeline_auto-ci-push.yaml
View File

@@ -78,6 +78,7 @@ spec:
name: gitea-set-status name: gitea-set-status
tasks: tasks:
- name: inform-gitea-start - name: inform-gitea-start
onError: continue
params: params:
- name: REPO_FULL_NAME - name: REPO_FULL_NAME
value: $(params.project-path) value: $(params.project-path)

4
share/organisation/ci-space.tf
View File

@@ -80,9 +80,9 @@ resource "kubernetes_secret" "ci-docker-config" {
auths = { auths = {
"${data.kubernetes_ingress_v1.gitea.spec[0].rule[0].host}" = { "${data.kubernetes_ingress_v1.gitea.spec[0].rule[0].host}" = {
"username" = gitea_user.user-ci[0].username "username" = gitea_user.user-ci[0].username
"password" = random_password.password.result "password" = local.ci-user-password
"email" = "auto-ci@${data.kubernetes_ingress_v1.gitea.spec[0].rule[0].host}" "email" = "auto-ci@${data.kubernetes_ingress_v1.gitea.spec[0].rule[0].host}"
"auth" = base64encode("${gitea_user.user-ci[0].username}:${random_password.password.result}") "auth" = base64encode("${gitea_user.user-ci[0].username}:${local.ci-user-password}")
} }
} }
}) })

3
share/organisation/gitea-user.tf
View File

@@ -4,6 +4,7 @@ locals {
gitea_host = "http://gitea-http.${var.domain}-ci.svc:3000/" gitea_host = "http://gitea-http.${var.domain}-ci.svc:3000/"
gitea_username = data.kubernetes_secret_v1.gitea.data["username"] gitea_username = data.kubernetes_secret_v1.gitea.data["username"]
gitea_password = data.kubernetes_secret_v1.gitea.data["password"] gitea_password = data.kubernetes_secret_v1.gitea.data["password"]
ci-user-password = random_password.password.result
} }
data "kubernetes_secret_v1" "gitea" { data "kubernetes_secret_v1" "gitea" {
@@ -83,7 +84,7 @@ resource "gitea_user" "user-ci" {
count = local.needKnownHost?1:0 count = local.needKnownHost?1:0
username = "${var.instance}-ci" username = "${var.instance}-ci"
login_name = "${var.instance}-ci" login_name = "${var.instance}-ci"
password = random_password.password.result password = local.ci-user-password
email = "${var.instance}-ci@${var.domain_name}" email = "${var.instance}-ci@${var.domain_name}"
must_change_password = true must_change_password = true
} }

4
share/organisation/stages.tf
View File

@@ -55,9 +55,9 @@ resource "kubernetes_secret" "docker-config" {
auths = { auths = {
"${data.kubernetes_ingress_v1.gitea.spec[0].rule[0].host}" = { "${data.kubernetes_ingress_v1.gitea.spec[0].rule[0].host}" = {
"username" = gitea_user.user-ci[0].username "username" = gitea_user.user-ci[0].username
"password" = random_password.password.result "password" = local.ci-user-password
"email" = "auto-ci@${data.kubernetes_ingress_v1.gitea.spec[0].rule[0].host}" "email" = "auto-ci@${data.kubernetes_ingress_v1.gitea.spec[0].rule[0].host}"
"auth" = base64encode("${gitea_user.user-ci[0].username}:${random_password.password.result}") "auth" = base64encode("${gitea_user.user-ci[0].username}:${local.ci-user-password}")
} }
} }
}) })