This commit is contained in:
2024-04-22 12:39:38 +02:00
parent c52743371f
commit 3ca76aaa86
3 changed files with 32 additions and 15 deletions

View File

@@ -19,20 +19,20 @@ resource "kubectl_manifest" "ci-trigger-push" {
labels: ${jsonencode(local.push-labels)} labels: ${jsonencode(local.push-labels)}
spec: spec:
bindings: bindings:
- name: artifactory-url - name: artifactory-url
value: "$(extensions.artifactory-url)" value: "$(extensions.artifactory-url)"
- name: project-name - name: project-name
value: "$(extensions.project-name)" value: "$(extensions.project-name)"
- name: project-path - name: project-path
value: "$(extensions.project-path)" value: "$(extensions.project-path)"
- name: git-repository-url - name: git-repository-url
value: "$(extensions.git-repository-url)" value: "$(extensions.git-repository-url)"
- name: git-revision - name: git-revision
value: "$(extensions.git-revision)" value: "$(extensions.git-revision)"
- name: git-default-branch - name: git-default-branch
value: "$(extensions.git-default-branch)" value: "$(extensions.git-default-branch)"
- name: branch-name - name: branch-name
value: $(extensions.branch-name) value: $(extensions.branch-name)
template: template:
spec: spec:
params: params:
@@ -90,6 +90,12 @@ resource "kubectl_manifest" "ci-trigger-push" {
resources: resources:
requests: requests:
storage: 1Gi storage: 1Gi
- name: sslcertdir
secret:
secretName: gitea
items:
- key: "ca.crt"
path: "ca.crt"
- name: ssh - name: ssh
secret: secret:
secretName: ssh-credentials secretName: ssh-credentials

View File

@@ -61,12 +61,21 @@ resource "restapi_object" "ci-token" {
}) })
} }
data "kubernetes_secret_v1" "gitea-cert" {
metadata {
name = "gitea-cert"
namespace = "${var.domain}-ci"
}
}
resource "kubernetes_secret_v1" "ci-user-token-secret" { resource "kubernetes_secret_v1" "ci-user-token-secret" {
metadata { metadata {
name = "gitea" name = "gitea"
namespace = "${var.namespace}" namespace = "${var.namespace}"
} }
data = { data = {
"ca.crt" = lookup(data.kubernetes_secret_v1.gitea-cert.data, "ca.crt", lookup(data.kubernetes_secret_v1.gitea-cert.data, "tls.crt", ""))
url = "gitea-http.${var.domain}-ci.svc:3000" url = "gitea-http.${var.domain}-ci.svc:3000"
token = jsondecode(resource.restapi_object.ci-token.create_response).sha1 token = jsondecode(resource.restapi_object.ci-token.create_response).sha1
} }

View File

@@ -6,6 +6,7 @@ spec:
workspaces: workspaces:
- name: source - name: source
- name: ssh - name: ssh
- name: sslcertdir
params: params:
- name: artifactory-url - name: artifactory-url
default: docker.io default: docker.io
@@ -221,3 +222,4 @@ spec:
value: $(tasks.detect-stages.results.images-name) value: $(tasks.detect-stages.results.images-name)
workspaces: workspaces:
- name: source - name: source
- name: sslcertdir