From 613da54d99baa0469ab84ca9e3021280a0618de4 Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Wed, 16 Mar 2022 18:30:18 +0100 Subject: [PATCH] migrated base images to pipeline runs --- .../tekton-debian-golang-img.yaml | 84 ---------------- _CI-CD/debian-golang/tekton.yaml | 23 +++++ .../debian-stable-build-essential/tekton.yaml | 98 ++++--------------- _CI-CD/debian-stable-php-fpm/tekton.yaml | 98 ++++--------------- .../debian-stable/tekton-debian-stable.yaml | 85 ---------------- _CI-CD/debian-stable/tekton.yaml | 23 +++++ 6 files changed, 82 insertions(+), 329 deletions(-) delete mode 100644 _CI-CD/debian-golang/tekton-debian-golang-img.yaml create mode 100644 _CI-CD/debian-golang/tekton.yaml delete mode 100644 _CI-CD/debian-stable/tekton-debian-stable.yaml create mode 100644 _CI-CD/debian-stable/tekton.yaml diff --git a/_CI-CD/debian-golang/tekton-debian-golang-img.yaml b/_CI-CD/debian-golang/tekton-debian-golang-img.yaml deleted file mode 100644 index e1d98d5..0000000 --- a/_CI-CD/debian-golang/tekton-debian-golang-img.yaml +++ /dev/null @@ -1,84 +0,0 @@ -apiVersion: tekton.dev/v1alpha1 -kind: PipelineResource -metadata: - name: chaos-kubernetes-git -spec: - type: git - params: - - name: revision - value: master - - name: url - value: http://git-ui.lan/chaos/kubernetes.git - - name: submodules - value: "false" ---- -apiVersion: tekton.dev/v1alpha1 -kind: PipelineResource -metadata: - name: img-debian-golang-stable -spec: - type: image - params: - - name: url - value: cr.lan/debian-golang-stable ---- -apiVersion: tekton.dev/v1beta1 -kind: Task -metadata: - name: build-debian-golang -spec: - params: - - name: pathToContainerFile - type: string - default: $(resources.inputs.source.path)/_CI-CD/debian-golang/Dockerfile - - name: pathToContext - type: string - default: $(resources.inputs.source.path)/_CI-CD/debian-golang - resources: - inputs: - - name: source - type: git - outputs: - - name: builtImage - type: image - steps: - - name: build-and-push - image: gcr.io/kaniko-project/executor:arm64 - command: - - /kaniko/executor - args: - - --dockerfile=$(params.pathToContainerFile) - - --destination=$(resources.outputs.builtImage.url) - - --context=$(params.pathToContext) - - --skip-tls-verify - #workspaces: - # - name: workspace - # mountPath: /workspace ---- -apiVersion: tekton.dev/v1beta1 -kind: TaskRun -metadata: - name: img-debian-golang -spec: - taskRef: - name: build-debian-golang - params: - - name: pathToContainerFile - value: Dockerfile - resources: - inputs: - - name: source - resourceRef: - name: chaos-kubernetes-git - outputs: - - name: builtImage - resourceRef: - name: img-debian-golang-stable -# workspaces: -# - name: workspace -# persistentVolumeClaim: -# claimName: tektoncd-workspaces -# subPath: workspaces - - - \ No newline at end of file diff --git a/_CI-CD/debian-golang/tekton.yaml b/_CI-CD/debian-golang/tekton.yaml new file mode 100644 index 0000000..b23f558 --- /dev/null +++ b/_CI-CD/debian-golang/tekton.yaml @@ -0,0 +1,23 @@ +apiVersion: tekton.dev/v1beta1 +kind: PipelineRun +metadata: + name: img-debian-golang +spec: + pipelineRef: + name: kaniko-pipeline + params: + - name: git-url + value: http://git-ui.lan/chaos/kubernetes.git + - name: git-revision + value: master + - name: path-to-image-context + value: _CI-CD/debian-golang + - name: path-to-dockerfile + value: _CI-CD/debian-golang/Dockerfile + - name: image-name + value: cr.lan/debian-stable-golang + workspaces: + - name: git-source + persistentVolumeClaim: + claimName: tektoncd-workspaces + subPath: usr_src/tekton-debian-stable-golang \ No newline at end of file diff --git a/_CI-CD/debian-stable-build-essential/tekton.yaml b/_CI-CD/debian-stable-build-essential/tekton.yaml index 4b4cd17..d263e66 100644 --- a/_CI-CD/debian-stable-build-essential/tekton.yaml +++ b/_CI-CD/debian-stable-build-essential/tekton.yaml @@ -1,85 +1,23 @@ -apiVersion: tekton.dev/v1alpha1 -kind: PipelineResource +apiVersion: tekton.dev/v1beta1 +kind: PipelineRun metadata: - name: chaos-kubernetes-git + name: img-debian-stable-build-essential spec: - type: git + pipelineRef: + name: kaniko-pipeline params: - - name: revision - value: master - - name: url + - name: git-url value: http://git-ui.lan/chaos/kubernetes.git - - name: submodules - value: "false" ---- -apiVersion: tekton.dev/v1alpha1 -kind: PipelineResource -metadata: - name: img-debian-stable-build-essential -spec: - type: image - params: - - name: url + - name: git-revision + value: master + - name: path-to-image-context + value: _CI-CD/debian-stable-build-essential + - name: path-to-dockerfile + value: _CI-CD/debian-stable-build-essential/Dockerfile + - name: image-name value: cr.lan/debian-stable-build-essential ---- -apiVersion: tekton.dev/v1beta1 -kind: Task -metadata: - name: build-debian-stable-build-essential -spec: - params: - - name: pathToContainerFile - type: string - default: $(resources.inputs.source.path)/_CI-CD/debian-stable-build-essential/Dockerfile - - name: pathToContext - type: string - default: $(resources.inputs.source.path)/_CI-CD/debian-stable-build-essential - resources: - inputs: - - name: source - type: git - outputs: - - name: builtImage - type: image - steps: - - name: build-and-push - image: gcr.io/kaniko-project/executor:arm64 - command: - - /kaniko/executor - args: - - --dockerfile=$(params.pathToContainerFile) - - --destination=$(resources.outputs.builtImage.url) - - --context=$(params.pathToContext) - - --snapshotMode=redo - - --skip-tls-verify - #workspaces: - # - name: workspace - # mountPath: /workspace ---- -apiVersion: tekton.dev/v1beta1 -kind: TaskRun -metadata: - name: img-debian-stable-build-essential -spec: - taskRef: - name: build-debian-stable-build-essential - params: - - name: pathToContainerFile - value: Dockerfile - resources: - inputs: - - name: source - resourceRef: - name: chaos-kubernetes-git - outputs: - - name: builtImage - resourceRef: - name: img-debian-stable-build-essential -# workspaces: -# - name: workspace -# persistentVolumeClaim: -# claimName: tektoncd-workspaces -# subPath: workspaces - - - \ No newline at end of file + workspaces: + - name: git-source + persistentVolumeClaim: + claimName: tektoncd-workspaces + subPath: usr_src/tekton-debian-stable-build-essential \ No newline at end of file diff --git a/_CI-CD/debian-stable-php-fpm/tekton.yaml b/_CI-CD/debian-stable-php-fpm/tekton.yaml index 15e5f9f..15ae633 100644 --- a/_CI-CD/debian-stable-php-fpm/tekton.yaml +++ b/_CI-CD/debian-stable-php-fpm/tekton.yaml @@ -1,85 +1,23 @@ -apiVersion: tekton.dev/v1alpha1 -kind: PipelineResource +apiVersion: tekton.dev/v1beta1 +kind: PipelineRun metadata: - name: chaos-kubernetes-git + name: img-debian-stable-php-fpm spec: - type: git + pipelineRef: + name: kaniko-pipeline params: - - name: revision - value: master - - name: url + - name: git-url value: http://git-ui.lan/chaos/kubernetes.git - - name: submodules - value: "false" ---- -apiVersion: tekton.dev/v1alpha1 -kind: PipelineResource -metadata: - name: img-debian-stable-php-fpm -spec: - type: image - params: - - name: url + - name: git-revision + value: master + - name: path-to-image-context + value: _CI-CD/debian-stable-php-fpm + - name: path-to-dockerfile + value: _CI-CD/debian-stable-php-fpm/Dockerfile + - name: image-name value: cr.lan/debian-stable-php-fpm ---- -apiVersion: tekton.dev/v1beta1 -kind: Task -metadata: - name: build-debian-stable-php-fpm -spec: - params: - - name: pathToContainerFile - type: string - default: $(resources.inputs.source.path)/_CI-CD/debian-stable-php-fpm/Dockerfile - - name: pathToContext - type: string - default: $(resources.inputs.source.path)/_CI-CD/debian-stable-php-fpm - resources: - inputs: - - name: source - type: git - outputs: - - name: builtImage - type: image - steps: - - name: build-and-push - image: gcr.io/kaniko-project/executor:arm64 - command: - - /kaniko/executor - args: - - --dockerfile=$(params.pathToContainerFile) - - --destination=$(resources.outputs.builtImage.url) - - --context=$(params.pathToContext) - - --snapshotMode=redo - - --skip-tls-verify - #workspaces: - # - name: workspace - # mountPath: /workspace ---- -apiVersion: tekton.dev/v1beta1 -kind: TaskRun -metadata: - name: img-debian-stable-php-fpm -spec: - taskRef: - name: build-debian-stable-php-fpm - params: - - name: pathToContainerFile - value: Dockerfile - resources: - inputs: - - name: source - resourceRef: - name: chaos-kubernetes-git - outputs: - - name: builtImage - resourceRef: - name: img-debian-stable-php-fpm -# workspaces: -# - name: workspace -# persistentVolumeClaim: -# claimName: tektoncd-workspaces -# subPath: workspaces - - - \ No newline at end of file + workspaces: + - name: git-source + persistentVolumeClaim: + claimName: tektoncd-workspaces + subPath: usr_src/tekton-debian-stable-php-fpm \ No newline at end of file diff --git a/_CI-CD/debian-stable/tekton-debian-stable.yaml b/_CI-CD/debian-stable/tekton-debian-stable.yaml deleted file mode 100644 index 5775440..0000000 --- a/_CI-CD/debian-stable/tekton-debian-stable.yaml +++ /dev/null @@ -1,85 +0,0 @@ -apiVersion: tekton.dev/v1alpha1 -kind: PipelineResource -metadata: - name: chaos-kubernetes-git -spec: - type: git - params: - - name: revision - value: master - - name: url - value: http://git-ui.lan/chaos/kubernetes.git - - name: submodules - value: "false" ---- -apiVersion: tekton.dev/v1alpha1 -kind: PipelineResource -metadata: - name: img-debian-stable -spec: - type: image - params: - - name: url - value: cr.lan/debian-stable ---- -apiVersion: tekton.dev/v1beta1 -kind: Task -metadata: - name: build-debian-stable -spec: - params: - - name: pathToContainerFile - type: string - default: $(resources.inputs.source.path)/_CI-CD/debian-stable/Dockerfile - - name: pathToContext - type: string - default: $(resources.inputs.source.path)/_CI-CD/debian-stable - resources: - inputs: - - name: source - type: git - outputs: - - name: builtImage - type: image - steps: - - name: build-and-push - image: gcr.io/kaniko-project/executor:arm64 - command: - - /kaniko/executor - args: - - --dockerfile=$(params.pathToContainerFile) - - --destination=$(resources.outputs.builtImage.url) - - --context=$(params.pathToContext) - - --snapshotMode=redo - - --skip-tls-verify - #workspaces: - # - name: workspace - # mountPath: /workspace ---- -apiVersion: tekton.dev/v1beta1 -kind: TaskRun -metadata: - name: img-debian-stable -spec: - taskRef: - name: build-debian-stable - params: - - name: pathToContainerFile - value: Dockerfile - resources: - inputs: - - name: source - resourceRef: - name: chaos-kubernetes-git - outputs: - - name: builtImage - resourceRef: - name: img-debian-stable -# workspaces: -# - name: workspace -# persistentVolumeClaim: -# claimName: tektoncd-workspaces -# subPath: workspaces - - - \ No newline at end of file diff --git a/_CI-CD/debian-stable/tekton.yaml b/_CI-CD/debian-stable/tekton.yaml new file mode 100644 index 0000000..939542f --- /dev/null +++ b/_CI-CD/debian-stable/tekton.yaml @@ -0,0 +1,23 @@ +apiVersion: tekton.dev/v1beta1 +kind: PipelineRun +metadata: + name: img-debian-stable +spec: + pipelineRef: + name: kaniko-pipeline + params: + - name: git-url + value: http://git-ui.lan/chaos/kubernetes.git + - name: git-revision + value: master + - name: path-to-image-context + value: _CI-CD/debian-stable + - name: path-to-dockerfile + value: _CI-CD/debian-stable/Dockerfile + - name: image-name + value: cr.lan/debian-stable + workspaces: + - name: git-source + persistentVolumeClaim: + claimName: tektoncd-workspaces + subPath: usr_src/tekton-debian-stable \ No newline at end of file