From 98ac2b0cb95f8e40ef3df626ce55b96fd425649f Mon Sep 17 00:00:00 2001 From: JesusPerez Date: Wed, 23 Jun 2021 06:24:26 +0100 Subject: [PATCH] chore: fix domain in pipiline --- README.md | 22 +++++++++++----------- pipeline/PersistentVolumeCDCI.yaml | 4 ++-- pipeline/pipe-resource.yaml | 8 ++++---- pipeline/pipeline-run.yaml | 2 +- pipeline/pipeline.yaml | 2 +- pipeline/task.yaml | 20 ++++++++++++++++++-- pipeline/up.sh | 2 +- 7 files changed, 38 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 25a2629..be9effa 100644 --- a/README.md +++ b/README.md @@ -4,35 +4,35 @@ This is to build a [__container image__](https://www.docker.com/resources/what-c It uses [source docker-webhook repo](https://github.com/almir/docker-webhook/blob/master/Dockerfile) to run [webhook](https://github.com/adnanh/webhook) as a listen process. -It has a key role in [LibreCloud Termas CD/CI](https://repo.librecloud.services/termas_librecloud/librecloud-termas-cd-ci) procedures to trigger _workflow_ and [build automation](https://en.wikipedia.org/wiki/Build_automation). +It has a key role in [LibreCloud Termas CD/CI](https://repo.librecloud.online/termas_librecloud/librecloud-termas-cd-ci) procedures to trigger _workflow_ and [build automation](https://en.wikipedia.org/wiki/Build_automation). -[Container image](https://www.docker.com/resources/what-container) can be found in [**src** Dockerfile](https://repo.librecloud.services/termas_librecloud/webhook-pipeline/src/branch/master/src/Dockerfile) +[Container image](https://www.docker.com/resources/what-container) can be found in [**src** Dockerfile](https://repo.librecloud.online/termas_librecloud/webhook-pipeline/src/branch/master/src/Dockerfile) [Tekton Pipeline](https://github.com/tektoncd/pipeline) can be found in [**pipeline** directory] -(https://repo.librecloud.services/termas_librecloud/webhook-pipeline/src/branch/master/pipeline). +(https://repo.librecloud.online/termas_librecloud/webhook-pipeline/src/branch/master/pipeline). ## Configuration -[LibreCloud Termas CD/CI configuation](https://repo.librecloud.services/termas_librecloud/librecloud-termas-cd-ci#configuration) +[LibreCloud Termas CD/CI configuation](https://repo.librecloud.online/termas_librecloud/librecloud-termas-cd-ci#configuration) ## Pipeline -[LibreCloud Termas CD/CI pipeline](https://repo.librecloud.services/termas_librecloud/librecloud-termas-cd-ci#pipeline) +[LibreCloud Termas CD/CI pipeline](https://repo.librecloud.online/termas_librecloud/librecloud-termas-cd-ci#pipeline) ## Service -Some scripts to check, config and run a [Tekton Pipeline](https://github.com/tektoncd/pipeline) are need it in final service to complete [LibreCloud Termas CD/CI](https://librecloud.services/termas-cd-ci) as a [CD](https://en.wikipedia.org/wiki/Continuous_delivery)/[CI](https://en.wikipedia.org/wiki/Continuous_integration) workflow. +Some scripts to check, config and run a [Tekton Pipeline](https://github.com/tektoncd/pipeline) are need it in final service to complete [LibreCloud Termas CD/CI](https://librecloud.online/termas-cd-ci) as a [CD](https://en.wikipedia.org/wiki/Continuous_delivery)/[CI](https://en.wikipedia.org/wiki/Continuous_integration) workflow. -A [Webhook-Pipe Image](https://repo.librecloud.services/termas_librecloud/webhook-pipeline) configured service can be found in [LibreCloud webhook-pipeline service](https://repo.librecloud.services/services_librecloud/webhook-pipeline) as an implementation of [LibreCloud Services](https://repo.librecloud.services/services_librecloud/librecloud-services) +A [Webhook-Pipe Image](https://repo.librecloud.online/termas_librecloud/webhook-pipeline) configured service can be found in [LibreCloud webhook-pipeline service](https://repo.librecloud.online/services_librecloud/webhook-pipeline) as an implementation of [LibreCloud Services](https://repo.librecloud.online/services_librecloud/librecloud.online) In most cases final service will need additional or multiple [containers](https://www.docker.com/resources/what-container) to run, as [init containers](https://kubernetes.io/docs/concepts/workloads/pods/init-containers/) or [sidecar containers] (https://kubernetes.io/docs/concepts/workloads/pods/pod-overview/). ## Install -[LibreCloud Termas CD/CI installation](https://repo.librecloud.services/termas_librecloud/librecloud-termas-cd-ci#install) +[LibreCloud Termas CD/CI installation](https://repo.librecloud.online/termas_librecloud/librecloud-termas-cd-ci#install) ## Task list -[LibreCloud Termas CD/CI task list] (https://repo.librecloud.services/termas_librecloud/librecloud-termas-cd-ci#terma-tasks-list) +[LibreCloud Termas CD/CI task list] (https://repo.librecloud.online/termas_librecloud/librecloud-termas-cd-ci#terma-tasks-list) ## Directory content - [LibreCloud Termas CD/CI Directory content] (https://repo.librecloud.services/termas_librecloud/librecloud-termas-cd-ci#directory-content) + [LibreCloud Termas CD/CI Directory content] (https://repo.librecloud.online/termas_librecloud/librecloud-termas-cd-ci#directory-content) ## References -Use [LibreCloud Termas CD/CI References](https://repo.librecloud.services/termas_librecloud/librecloud-termas-cd-ci#references) +Use [LibreCloud Termas CD/CI References](https://repo.librecloud.online/termas_librecloud/librecloud-termas-cd-ci#references) diff --git a/pipeline/PersistentVolumeCDCI.yaml b/pipeline/PersistentVolumeCDCI.yaml index 2bf41ea..49c6a40 100644 --- a/pipeline/PersistentVolumeCDCI.yaml +++ b/pipeline/PersistentVolumeCDCI.yaml @@ -2,7 +2,7 @@ kind: PersistentVolume apiVersion: v1 metadata: name: cdci-webhook-pipeline-pvc-volume - namespace: cdci-librecloud-services + namespace: cdci-librecloud-online labels: type: local spec: @@ -19,7 +19,7 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: name: cdci-webhook-pipeline-pvc - namespace: cdci-librecloud-services + namespace: cdci-librecloud-online spec: storageClassName: manual accessModes: diff --git a/pipeline/pipe-resource.yaml b/pipeline/pipe-resource.yaml index 4dd2152..324fc4d 100644 --- a/pipeline/pipe-resource.yaml +++ b/pipeline/pipe-resource.yaml @@ -2,23 +2,23 @@ apiVersion: tekton.dev/v1alpha1 kind: PipelineResource metadata: name: librecloud-webhook-pipeline-img - namespace: cdci-librecloud-services + namespace: cdci-librecloud-online spec: type: image params: - name: url - value: termas.librecloud.services/termas_librecloud/webhook-pipeline:2.7.0 + value: termas.librecloud.online/termas_librecloud/webhook-pipeline:2.8.0 --- apiVersion: tekton.dev/v1alpha1 kind: PipelineResource metadata: name: librecloud-webhook-pipeline-git - namespace: cdci-librecloud-services + namespace: cdci-librecloud-online spec: type: git params: - name: revision value: master - name: url - value: https://CREDENTIALS@repo.librecloud.services/termas_librecloud/webhook-pipeline.git + value: https://CREDENTIALS@rlung.librecloud.online/Termas_LibreCloud/webhook-pipeline.git diff --git a/pipeline/pipeline-run.yaml b/pipeline/pipeline-run.yaml index 3c2c653..9c826ba 100644 --- a/pipeline/pipeline-run.yaml +++ b/pipeline/pipeline-run.yaml @@ -2,7 +2,7 @@ apiVersion: tekton.dev/v1alpha1 kind: PipelineRun metadata: name: cdci-webhook-pipeline - namespace: cdci-librecloud-services + namespace: cdci-librecloud-online spec: serviceAccountName: build-bot pipelineRef: diff --git a/pipeline/pipeline.yaml b/pipeline/pipeline.yaml index 717d0f5..89bb302 100644 --- a/pipeline/pipeline.yaml +++ b/pipeline/pipeline.yaml @@ -2,7 +2,7 @@ apiVersion: tekton.dev/v1alpha1 kind: Pipeline metadata: name: cdci-webhook-pipeline - namespace: cdci-librecloud-services + namespace: cdci-librecloud-online spec: #serviceAccount: build-bot resources: diff --git a/pipeline/task.yaml b/pipeline/task.yaml index c8e28d0..5f6c64c 100644 --- a/pipeline/task.yaml +++ b/pipeline/task.yaml @@ -2,7 +2,7 @@ apiVersion: tekton.dev/v1alpha1 kind: Task metadata: name: webhook-pipeline-build-image-from-git-source - namespace: cdci-librecloud-services + namespace: cdci-librecloud-online spec: #serviceAccount: build-bot inputs: @@ -25,7 +25,7 @@ spec: type: string description: The name of the BuildKit client (buildctl) image - default: "moby/buildkit:v0.6.2" + default: "docker.io/moby/buildkit:master-rootless" - name: BUILDKIT_DAEMON_ADDRESS type: string description: The address of the BuildKit daemon (buildkitd) service @@ -45,6 +45,9 @@ spec: - name: ssh-volume secret: secretName: ssh-key + - name: certs + secret: + secretName: buildkit-client-certs steps: - name: build-and-push @@ -55,6 +58,12 @@ spec: command: [ "buildctl" ] args: + - --tlscacert + - /certs/ca.pem + - --tlscert + - /certs/cert.pem + - --tlskey + - /certs/key.pem - --debug - --addr=$(inputs.params.BUILDKIT_DAEMON_ADDRESS) - build @@ -72,4 +81,11 @@ spec: - type=inline - --import-cache - type=registry,ref=$(outputs.resources.builtImage.url) + volumeMounts: + - name: certs + readOnly: true + mountPath: /certs + - name: ssh-volume + readOnly: true + mountPath: /.ssh diff --git a/pipeline/up.sh b/pipeline/up.sh index f158795..924d4db 100755 --- a/pipeline/up.sh +++ b/pipeline/up.sh @@ -1,6 +1,6 @@ #/bin/bash FOLLOW_UP="yes" -NS_DOMAIN="cdci-librecloud-services" +NS_DOMAIN="cdci-librecloud-online" PIPELINE_NAME="cdci-webhook-pipeline" [ "$1" == "-s" ] && FOLLOW_UP="" is_running=`kubectl get pods -n $NS_DOMAIN | grep $PIPELINE_NAME 2>/dev/null`