比较文本

查找两个文本文件之间的差异

实时编辑器

隐藏空白更改

折叠未更改行

关闭换行

视图

比对精度

文本样式

语法高亮

Diffchecker Desktop 运行Diffchecker最安全的方式。获取Diffchecker桌面应用：您的差异永远不会离开您的电脑！获取桌面版

tekton-task-diff

创建于 6年前差异永不过期

30 删除

行
总计
删除

字符
总计
删除

要继续使用此功能，请升级到 Diffchecker Pro 查看价格

115 行

33 添加

行
总计
添加

字符
总计
添加

要继续使用此功能，请升级到 Diffchecker Pro 查看价格

117 行

apiVersion: tekton.dev/v1beta1

kind: TaskRun

metadata:

annotations:

kubectl.kubernetes.io/last-applied-configuration: |

{"apiVersion":"tekton.dev/v1beta1","kind":"Task","metadata":{"annotations":{},"labels":{"argocd.argoproj.io/instance":"tekton"},"name":"echo-hello-world","namespace":"tekton-pipelines"},"spec":{"steps":[{"args":["Hello World"],"command":["echo"],"image":"ubuntu","name":"echo"},{"args":["15"],"command":["sleep"],"image":"ubuntu","name":"wait"},{"args":["Hello World"],"command":["echo"],"image":"ubuntu","name":"echo-again"}]}}

pipeline.tekton.dev/release: devel

creationTimestamp: "2020-09-01T21:46:38Z"

creationTimestamp: "2020-09-01T21:46:54Z"

generation: 1

labels:

app.kubernetes.io/managed-by: tekton-pipelines

argocd.argoproj.io/instance: tekton

tekton.dev/task: echo-hello-world

managedFields:

- apiVersion: tekton.dev/v1beta1

fieldsType: FieldsV1

fieldsV1:

f:metadata:

f:annotations: { }

f:labels:

.: { }

f:argocd.argoproj.io/instance: { }

f:tekton.dev/task: { }

f:spec:

.: { }

f:params: { }

f:resources:

.: { }

f:inputs: { }

f:outputs: { }

f:taskRef:

.: { }

f:kind: { }

f:name: { }

manager: argocd-application-controller

f:timeout: { }

manager: Go-http-client

operation: Update

time: "2020-09-01T21:46:58Z"

time: "2020-09-01T21:46:54Z"

- apiVersion: tekton.dev/v1beta1

fieldsType: FieldsV1

fieldsV1:

f:metadata:

f:annotations:

.: { }

f:kubectl.kubernetes.io/last-applied-configuration: { }

f:pipeline.tekton.dev/release: { }

f:labels:

f:tekton.dev/task: { }

f:argocd.argoproj.io/instance: { }

f:status:

.: { }

f:conditions: { }

f:podName: { }

f:startTime: { }

f:steps: { }

f:taskSpec:

.: { }

f:steps: { }

manager: controller

operation: Update

time: "2020-09-01T21:46:58Z"

time: "2020-09-01T21:46:55Z"

namespace: tekton-pipelines

resourceVersion: "46269826"

resourceVersion: "46269757"

selfLink: /apis/tekton.dev/v1beta1/namespaces/tekton-pipelines/taskruns/echo-hello-world-task-run

selfLink: /apis/tekton.dev/v1beta1/namespaces/tekton-pipelines/taskruns/echo-hello-world-run-1598996814144

uid: 33c0a011-4f9a-4404-b1f1-5eea7605a314

uid: 7ee17092-1c2b-447c-bca3-7f8c1eb27239

spec:

resources: { }

serviceAccountName: ""

taskRef:

kind: Task

timeout: 1h0m0s

status:

conditions:

- lastTransitionTime: "2020-09-01T21:46:46Z"

- lastTransitionTime: "2020-09-01T21:46:55Z"

message: Not all Steps in the Task have finished executing

message: 'pod status "Ready":"False"; message: "containers with unready status:

reason: Running

[step-echo step-wait step-echo-again]"'

reason: Pending

status: Unknown

type: Succeeded

podName: echo-hello-world-task-run-pod-qxk4m

podName: echo-hello-world-run-1598996814144-pod-n47qx

startTime: "2020-09-01T21:46:38Z"

startTime: "2020-09-01T21:46:54Z"

steps:

- container: step-echo

imageID: docker-pullable://ubuntu@sha256:31dfb10d52ce76c5ca0aa19d10b3e6424b830729e32a89a7c6eee2cda2be67a5

terminated:

waiting:

containerID: docker://895d8489a942a51351b56621c9b90328aa73d7cee3a058eb92891406cdffa10c

reason: PodInitializing

exitCode: 0

finishedAt: "2020-09-01T21:46:48Z"

reason: Completed

startedAt: "2020-09-01T21:46:48Z"

- container: step-wait

imageID: docker-pullable://ubuntu@sha256:31dfb10d52ce76c5ca0aa19d10b3e6424b830729e32a89a7c6eee2cda2be67a5

running:

waiting:

startedAt: "2020-09-01T21:46:44Z"

reason: PodInitializing

- container: step-echo-again

imageID: docker-pullable://ubuntu@sha256:31dfb10d52ce76c5ca0aa19d10b3e6424b830729e32a89a7c6eee2cda2be67a5

running:

waiting:

startedAt: "2020-09-01T21:46:46Z"

reason: PodInitializing

taskSpec:

steps:

- args:

- Hello World

command:

- echo

image: ubuntu

resources: { }

- args:

- "15"

command:

- sleep

image: ubuntu

resources: { }

- args:

- Hello World

command:

- echo

image: ubuntu

resources: { }

已保存差异

原始文本

打开文件

apiVersion: tekton.dev/v1beta1
kind: TaskRun
metadata:
  annotations:
    kubectl.kubernetes.io/last-applied-configuration: |
      {"apiVersion":"tekton.dev/v1beta1","kind":"Task","metadata":{"annotations":{},"labels":{"argocd.argoproj.io/instance":"tekton"},"name":"echo-hello-world","namespace":"tekton-pipelines"},"spec":{"steps":[{"args":["Hello World"],"command":["echo"],"image":"ubuntu","name":"echo"},{"args":["15"],"command":["sleep"],"image":"ubuntu","name":"wait"},{"args":["Hello World"],"command":["echo"],"image":"ubuntu","name":"echo-again"}]}}
    pipeline.tekton.dev/release: devel
  creationTimestamp: "2020-09-01T21:46:38Z"
  generation: 1
  labels:
    app.kubernetes.io/managed-by: tekton-pipelines
    argocd.argoproj.io/instance: tekton
    tekton.dev/task: echo-hello-world
  managedFields:
    - apiVersion: tekton.dev/v1beta1
      fieldsType: FieldsV1
      fieldsV1:
        f:metadata:
          f:annotations: { }
          f:labels:
            .: { }
            f:argocd.argoproj.io/instance: { }
        f:spec:
          .: { }
          f:taskRef:
            .: { }
            f:name: { }
      manager: argocd-application-controller
      operation: Update
      time: "2020-09-01T21:46:58Z"
    - apiVersion: tekton.dev/v1beta1
      fieldsType: FieldsV1
      fieldsV1:
        f:metadata:
          f:annotations:
            f:kubectl.kubernetes.io/last-applied-configuration: { }
            f:pipeline.tekton.dev/release: { }
          f:labels:
            f:tekton.dev/task: { }
        f:status:
          .: { }
          f:conditions: { }
          f:podName: { }
          f:startTime: { }
          f:steps: { }
          f:taskSpec:
            .: { }
            f:steps: { }
      manager: controller
      operation: Update
      time: "2020-09-01T21:46:58Z"
  name: echo-hello-world-task-run
  namespace: tekton-pipelines
  resourceVersion: "46269826"
  selfLink: /apis/tekton.dev/v1beta1/namespaces/tekton-pipelines/taskruns/echo-hello-world-task-run
  uid: 33c0a011-4f9a-4404-b1f1-5eea7605a314
spec:
  serviceAccountName: ""
  taskRef:
    kind: Task
    name: echo-hello-world
  timeout: 1h0m0s
status:
  conditions:
    - lastTransitionTime: "2020-09-01T21:46:46Z"
      message: Not all Steps in the Task have finished executing
      reason: Running
      status: Unknown
      type: Succeeded
  podName: echo-hello-world-task-run-pod-qxk4m
  startTime: "2020-09-01T21:46:38Z"
  steps:
    - container: step-echo
      imageID: docker-pullable://ubuntu@sha256:31dfb10d52ce76c5ca0aa19d10b3e6424b830729e32a89a7c6eee2cda2be67a5
      name: echo
      terminated:
        containerID: docker://895d8489a942a51351b56621c9b90328aa73d7cee3a058eb92891406cdffa10c
        exitCode: 0
        finishedAt: "2020-09-01T21:46:48Z"
        reason: Completed
        startedAt: "2020-09-01T21:46:48Z"
    - container: step-wait
      imageID: docker-pullable://ubuntu@sha256:31dfb10d52ce76c5ca0aa19d10b3e6424b830729e32a89a7c6eee2cda2be67a5
      name: wait
      running:
        startedAt: "2020-09-01T21:46:44Z"
    - container: step-echo-again
      imageID: docker-pullable://ubuntu@sha256:31dfb10d52ce76c5ca0aa19d10b3e6424b830729e32a89a7c6eee2cda2be67a5
      name: echo-again
      running:
        startedAt: "2020-09-01T21:46:46Z"
  taskSpec:
    steps:
      - args:
          - Hello World
        command:
          - echo
        image: ubuntu
        name: echo
        resources: { }
      - args:
          - "15"
        command:
          - sleep
        image: ubuntu
        name: wait
        resources: { }
      - args:
          - Hello World
        command:
          - echo
        image: ubuntu
        name: echo-again
        resources: { }

更改后文本

打开文件

apiVersion: tekton.dev/v1beta1
kind: TaskRun
metadata:
  annotations:
    kubectl.kubernetes.io/last-applied-configuration: |
      {"apiVersion":"tekton.dev/v1beta1","kind":"Task","metadata":{"annotations":{},"labels":{"argocd.argoproj.io/instance":"tekton"},"name":"echo-hello-world","namespace":"tekton-pipelines"},"spec":{"steps":[{"args":["Hello World"],"command":["echo"],"image":"ubuntu","name":"echo"},{"args":["15"],"command":["sleep"],"image":"ubuntu","name":"wait"},{"args":["Hello World"],"command":["echo"],"image":"ubuntu","name":"echo-again"}]}}
    pipeline.tekton.dev/release: devel
  creationTimestamp: "2020-09-01T21:46:54Z"
  generation: 1
  labels:
    app.kubernetes.io/managed-by: tekton-pipelines
    argocd.argoproj.io/instance: tekton
    tekton.dev/task: echo-hello-world
  managedFields:
    - apiVersion: tekton.dev/v1beta1
      fieldsType: FieldsV1
      fieldsV1:
        f:metadata:
          f:labels:
            .: { }
            f:tekton.dev/task: { }
        f:spec:
          .: { }
          f:params: { }
          f:resources:
            .: { }
            f:inputs: { }
            f:outputs: { }
          f:taskRef:
            .: { }
            f:kind: { }
            f:name: { }
          f:timeout: { }
      manager: Go-http-client
      operation: Update
      time: "2020-09-01T21:46:54Z"
    - apiVersion: tekton.dev/v1beta1
      fieldsType: FieldsV1
      fieldsV1:
        f:metadata:
          f:annotations:
            .: { }
            f:kubectl.kubernetes.io/last-applied-configuration: { }
            f:pipeline.tekton.dev/release: { }
          f:labels:
            f:argocd.argoproj.io/instance: { }
        f:status:
          .: { }
          f:conditions: { }
          f:podName: { }
          f:startTime: { }
          f:steps: { }
          f:taskSpec:
            .: { }
            f:steps: { }
      manager: controller
      operation: Update
      time: "2020-09-01T21:46:55Z"
  name: echo-hello-world-run-1598996814144
  namespace: tekton-pipelines
  resourceVersion: "46269757"
  selfLink: /apis/tekton.dev/v1beta1/namespaces/tekton-pipelines/taskruns/echo-hello-world-run-1598996814144
  uid: 7ee17092-1c2b-447c-bca3-7f8c1eb27239
spec:
  resources: { }
  serviceAccountName: ""
  taskRef:
    kind: Task
    name: echo-hello-world
  timeout: 1h0m0s
status:
  conditions:
    - lastTransitionTime: "2020-09-01T21:46:55Z"
      message: 'pod status "Ready":"False"; message: "containers with unready status:
      [step-echo step-wait step-echo-again]"'
      reason: Pending
      status: Unknown
      type: Succeeded
  podName: echo-hello-world-run-1598996814144-pod-n47qx
  startTime: "2020-09-01T21:46:54Z"
  steps:
    - container: step-echo
      name: echo
      waiting:
        reason: PodInitializing
    - container: step-wait
      name: wait
      waiting:
        reason: PodInitializing
    - container: step-echo-again
      name: echo-again
      waiting:
        reason: PodInitializing
  taskSpec:
    steps:
      - args:
          - Hello World
        command:
          - echo
        image: ubuntu
        name: echo
        resources: { }
      - args:
          - "15"
        command:
          - sleep
        image: ubuntu
        name: wait
        resources: { }
      - args:
          - Hello World
        command:
          - echo
        image: ubuntu
        name: echo-again
        resources: { }