Add ssh-keyscan. Tell cargo to use git cli to login.

images/Dockerfile_limbo_builder

@@ -4,8 +4,7 @@ FROM docker.io/library/fedora:latest
 RUN sudo dnf update -y && \
     sudo dnf install -y nodejs yarnpkg \
                         openssl-devel curl \
-                        just gcc openssh-clients \
-                        git
+                        just gcc openssh-clients
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
 RUN /bin/bash -c "source $HOME/.cargo/env && rustup update"
 RUN /bin/bash -c "source $HOME/.cargo/env && rustup toolchain install nightly"

limbo/kustomization.yaml

@@ -3,9 +3,5 @@ kind: Kustomization
 resources:
 - limbo-just-build.yaml
 - limbo-pipeline.yaml
-- limbo-pipeline-listener.yaml
-- service-account.yaml
-- limbo-branch-trigger.yaml
-- limbo-web-branch-trigger.yaml
-- limbo-micro-host-branch-trigger.yaml
-- limbo-micro-branch-trigger.yaml
+- limbo-trigger.yaml
+- service-account.yaml

limbo/limbo-branch-trigger.yaml

@@ -1,51 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: limbo-branch-trigger-deployment
-  labels:
-    app: limbo-branch-trigger
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: limbo-branch-trigger
-  template:
-    metadata:
-      labels:
-        app: limbo-branch-trigger
-    spec:
-      volumes:
-      - name: git-credentials
-        secret:
-          secretName: git-credentials
-      containers:
-      - name: branch-trigger
-        image: harbor.internal.jpace121.net/k8s/j7s_branch_trigger:latest
-        command: ["/bin/sh","-c"]
-        args:
-        - mkdir ~/.ssh;
-          chmod 700 ~/.ssh;
-          cp -r /secrets/. ~/.ssh;
-          chmod -R 400 ~/.ssh/*;
-          ssh-keyscan -H -p 2222 git.jpace121.net >> ~/.ssh/known_hosts;
-          j7s_branch_trigger
-        env:
-        - name: J7S_REPO
-          value: "ssh://git@git.jpace121.net:2222/limbo/limbo.git"
-        - name: J7S_URL
-          value: "http://el-limbo-pipeline-listener.j7s-ci.svc.cluster.local:8080"
-        - name: J7S_ORG_NAME
-          value: "limbo"
-        - name: J7S_REPO_NAME
-          value: "limbo"
-        - name: J7S_JOB_NAME
-          value: "limbo"
-        - name: J7S_PATTERN
-          value: "^refs/heads/.*?$"
-        - name: J7S_LOOPTIME
-          value: "5.0"
-        volumeMounts:
-        - name: git-credentials
-          readOnly: true
-          mountPath: "/secrets"

limbo/limbo-micro-branch-trigger.yaml

@@ -1,51 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: limbo-micro-branch-trigger-deployment
-  labels:
-    app: limbo-micro-branch-trigger
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: limbo-micro-branch-trigger
-  template:
-    metadata:
-      labels:
-        app: limbo-micro-branch-trigger
-    spec:
-      volumes:
-      - name: git-credentials
-        secret:
-          secretName: git-credentials
-      containers:
-      - name: branch-trigger
-        image: harbor.internal.jpace121.net/k8s/j7s_branch_trigger:latest
-        command: ["/bin/sh","-c"]
-        args:
-        - mkdir ~/.ssh;
-          chmod 700 ~/.ssh;
-          cp -r /secrets/. ~/.ssh;
-          chmod -R 400 ~/.ssh/*;
-          ssh-keyscan -H -p 2222 git.jpace121.net >> ~/.ssh/known_hosts;
-          j7s_branch_trigger
-        env:
-        - name: J7S_REPO
-          value: "ssh://git@git.jpace121.net:2222/limbo/limbo_micro.git"
-        - name: J7S_URL
-          value: "http://el-limbo-pipeline-listener.j7s-ci.svc.cluster.local:8080"
-        - name: J7S_PATTERN
-          value: "^refs/heads/.*?$"
-        - name: J7S_ORG_NAME
-          value: "limbo"
-        - name: J7S_REPO_NAME
-          value: "limbo_micro"
-        - name: J7S_JOB_NAME
-          value: "limbo-micro"
-        - name: J7S_LOOPTIME
-          value: "3.0"
-        volumeMounts:
-        - name: git-credentials
-          readOnly: true
-          mountPath: "/secrets"

limbo/limbo-micro-host-branch-trigger.yaml

@@ -1,51 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: limbo-micro-host-branch-trigger-deployment
-  labels:
-    app: limbo-micro-host-branch-trigger
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: limbo-micro-host-branch-trigger
-  template:
-    metadata:
-      labels:
-        app: limbo-micro-host-branch-trigger
-    spec:
-      volumes:
-      - name: git-credentials
-        secret:
-          secretName: git-credentials
-      containers:
-      - name: branch-trigger
-        image: harbor.internal.jpace121.net/k8s/j7s_branch_trigger:latest
-        command: ["/bin/sh","-c"]
-        args:
-        - mkdir ~/.ssh;
-          chmod 700 ~/.ssh;
-          cp -r /secrets/. ~/.ssh;
-          chmod -R 400 ~/.ssh/*;
-          ssh-keyscan -H -p 2222 git.jpace121.net >> ~/.ssh/known_hosts;
-          j7s_branch_trigger
-        env:
-        - name: J7S_REPO
-          value: "ssh://git@git.jpace121.net:2222/limbo/limbo_micro_host.git"
-        - name: J7S_URL
-          value: "http://el-limbo-pipeline-listener.j7s-ci.svc.cluster.local:8080"
-        - name: J7S_PATTERN
-          value: "^refs/heads/.*?$"
-        - name: J7S_ORG_NAME
-          value: "limbo"
-        - name: J7S_REPO_NAME
-          value: "limbo_micro_host"
-        - name: J7S_JOB_NAME
-          value: "limbo-micro-host"
-        - name: J7S_LOOPTIME
-          value: "3.0"
-        volumeMounts:
-        - name: git-credentials
-          readOnly: true
-          mountPath: "/secrets"

limbo/limbo-pipeline.yaml

@@ -18,9 +18,6 @@ spec:
   - name: gitea-repo-name
     description: name of the repo in gitea (the part right before .git in the clone url)
     default: limbo
-  - name: gitea-org-name
-    description: name of the org in gitea
-    default: limbo
   tasks:
   - name: fetch-repo
     workspaces:
@@ -48,9 +45,9 @@ spec:
     - name: gitea-status
       params:
         - name: git-owner
-          value: $(params.gitea-org-name)
+          value: limbo
         - name: description
-          value: $(context.pipelineRun.name)
+          value: $(tasks.status)
         - name: git-repo-name
           value: $(params.gitea-repo-name)
         - name: name

limbo/limbo-trigger.yaml

@@ -25,10 +25,6 @@ spec:
       value: $(body.sha)
     - name: repo_name
       value: $(body.repo_name)
-    - name: org_name
-      value: $(body.org_name)
-    - name: job_name
-      value: $(body.job_name)
 ---
 apiVersion: triggers.tekton.dev/v1beta1
 kind: TriggerTemplate
@@ -38,13 +34,11 @@ spec:
   params:
   - name: sha
   - name: repo_name
-  - name: org_name
-  - name: job_name
   resourcetemplates:
   - apiVersion: tekton.dev/v1beta1
     kind: PipelineRun
     metadata:
-      generateName: "$(tt.params.job_name)-pipeline-"
+      generateName: "limbo-pipeline-"
     spec:
       pipelineRef:
         name: limbo-pipeline
@@ -53,8 +47,6 @@ spec:
         value: "$(tt.params.sha)"
       - name: gitea-repo-name
         value: "$(tt.params.repo_name)"
-      - name: gitea-org-name
-        value: "$(tt.params.org_name)"
       workspaces:
       - name: shared-data
         volumeClaimTemplate:

limbo/limbo-web-branch-trigger.yaml

@@ -1,51 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: limbo-web-branch-trigger-deployment
-  labels:
-    app: limbo-web-branch-trigger
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: limbo-web-branch-trigger
-  template:
-    metadata:
-      labels:
-        app: limbo-web-branch-trigger
-    spec:
-      volumes:
-      - name: git-credentials
-        secret:
-          secretName: git-credentials
-      containers:
-      - name: branch-trigger
-        image: harbor.internal.jpace121.net/k8s/j7s_branch_trigger:latest
-        command: ["/bin/sh","-c"]
-        args:
-        - mkdir ~/.ssh;
-          chmod 700 ~/.ssh;
-          cp -r /secrets/. ~/.ssh;
-          chmod -R 400 ~/.ssh/*;
-          ssh-keyscan -H -p 2222 git.jpace121.net >> ~/.ssh/known_hosts;
-          j7s_branch_trigger
-        env:
-        - name: J7S_REPO
-          value: "ssh://git@git.jpace121.net:2222/limbo/limbo_web.git"
-        - name: J7S_URL
-          value: "http://el-limbo-pipeline-listener.j7s-ci.svc.cluster.local:8080"
-        - name: J7S_PATTERN
-          value: "^refs/heads/.*?$"
-        - name: J7S_ORG_NAME
-          value: "limbo"
-        - name: J7S_REPO_NAME
-          value: "limbo_web"
-        - name: J7S_JOB_NAME
-          value: "limbo-web"
-        - name: J7S_LOOPTIME
-          value: "5.0"
-        volumeMounts:
-        - name: git-credentials
-          readOnly: true
-          mountPath: "/secrets"