From 40bfb83b5517a97ba9ba87c8369d822b7875b1be Mon Sep 17 00:00:00 2001
From: Udo Waechter <udo@maketank.net>
Date: Mon, 23 Oct 2023 18:53:29 +0200
Subject: [PATCH] Trying hard to get this running...

---
 build-dir825-rndis.yaml  | 12 ++++--
 openwrt-build-image.yaml | 88 ++++++++--------------------------------
 2 files changed, 26 insertions(+), 74 deletions(-)

diff --git a/build-dir825-rndis.yaml b/build-dir825-rndis.yaml
index e146d80..f8044f1 100644
--- a/build-dir825-rndis.yaml
+++ b/build-dir825-rndis.yaml
@@ -28,6 +28,9 @@ spec:
     inputs:
       - name: openwrt-configs
         type: git
+  workspaces:
+    - name: tmp
+      mountPath: /usr/src/openwrt/tmp
   steps:
     - name: openwrt-get
       resources:
@@ -64,6 +67,7 @@ spec:
         CCACHE_DIR=$(echo staging_dir/target-*)/ccache ccache -s
         ls -la .
         export FORCE_UNSAFE_CONFIGURE=1
+        export IGNORE_ERRORS=1
         ### cleanup
         #make clean
         #./scripts/feeds clean -a
@@ -121,7 +125,7 @@ spec:
       resourceRef:
         name: openwrt-configs-git
   workspaces:
-  - name: usr-src
-    persistentVolumeClaim:
-      claimName: tektoncd-workspaces
-    subPath: usr_src
+    - name: usr-src
+      persistentVolumeClaim:
+        claimName: tektoncd-workspaces
+      subPath: usr_src
\ No newline at end of file
diff --git a/openwrt-build-image.yaml b/openwrt-build-image.yaml
index 3c20a30..3243bf2 100644
--- a/openwrt-build-image.yaml
+++ b/openwrt-build-image.yaml
@@ -1,75 +1,23 @@
-apiVersion: tekton.dev/v1alpha1
-kind: PipelineResource
+apiVersion: tekton.dev/v1beta1
+kind: PipelineRun
 metadata:
-  name: openwrt-configs-git
+  name: img-debian-stable-openwrt-build
 spec:
-  type: git
+  pipelineRef:
+    name: kaniko-pipeline
   params:
-    - name: revision
-      value: master
-    - name: url
+    - name: git-url
       value: http://git-ui.lan/chaos/openwrt-configs.git
----
-apiVersion: tekton.dev/v1alpha1
-kind: PipelineResource
-metadata:
-  name: img-debian-stable-openwrt-build
-spec:
-  type: image
-  params:
-    - name: url
-      value: cr.lan/debian-stable-openwrt-build
----
-apiVersion: tekton.dev/v1beta1
-kind: Task
-metadata:
-  name: build-debian-stable-openwrt-build
-spec:
-  params:
-    - name: pathToContainerFile
-      type: string
-      default: $(resources.inputs.source.path)/Dockerfile
-    - name: pathToContext
-      type: string
-      default: $(resources.inputs.source.path)
-  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
----
-apiVersion: tekton.dev/v1beta1
-kind: TaskRun
-metadata:
-  name: img-debian-stable-openwrt-build
-spec:
-  taskRef:
-    name: build-debian-stable-openwrt-build
-  params:
-    - name: pathToContainerFile
+    - name: git-revision
+      value: master
+    - name: path-to-image-context
+      value: ./
+    - name: path-to-dockerfile
       value: Dockerfile
-  resources:
-    inputs:
-      - name: source
-        resourceRef:
-          name: openwrt-configs-git
-    outputs:
-      - name: builtImage
-        resourceRef:
-          name: img-debian-stable-openwrt-build
-          
-          
-          
\ No newline at end of file
+    - name: image-name
+      value: cr.lan/debian-stable-openwrt-build
+  workspaces:
+      - name: git-source
+        persistentVolumeClaim:
+          claimName: tektoncd-workspaces
+        subPath: tekton/debian-stable-openwrt-build
\ No newline at end of file