テキスト比較

2 つのテキストファイルの違いを見つける

ライブエディター

未変更行を折りたたむ

折り返しなし

レイアウト

比較精度

シンタックスハイライト

Diffchecker Desktop Diffcheckerを実行する最も安全な方法。Diffchecker Desktopアプリを入手：あなたの差分はコンピューターから出ることはありません！Desktopを入手

Untitled diff

作成日 9 年前差分は期限切れになりません

10 削除

行
合計
削除

文字
合計
削除

この機能を引き続き使用するには、アップグレードしてください Diffchecker Pro 価格を見る

53 行

7 追加

行
合計
追加

文字
合計
追加

この機能を引き続き使用するには、アップグレードしてください Diffchecker Pro 価格を見る

50 行

- name: pull-kubernetes-unit

- name: pull-kubernetes-unit-prow

agent: kubernetes

branches:

always_run: false

- release-1.6

context: pull-kubernetes-unit-prow

- release-1.7

rerun_command: "/test pull-kubernetes-unit-prow"

- release-1.8

trigger: "(?m)^/test pull-kubernetes-unit-prow,?(\\s+|$)"

always_run: true

context: pull-kubernetes-unit

rerun_command: "/test pull-kubernetes-unit"

trigger: "(?m)^/test( all| pull-kubernetes-unit),?(\\s+|$)"

spec:

containers:

- image: gcr.io/k8s-testimages/bootstrap:v20171127-a1522ede

- image: gcr.io/k8s-testimages/bootstrap:latest

imagePullPolicy: Always

args:

- "--clean"

- "--git-cache=/root/.cache/git"

- "--job=$(JOB_NAME)"

- "--repo=k8s.io/$(REPO_NAME)=$(PULL_REFS)"

- "--service-account=/etc/service-account/service-account.json"

- "--upload=gs://kubernetes-jenkins/pr-logs"

- "--timeout=60"

env:

- name: DOCKER_IN_DOCKER_ENABLED

value: true

- name: GOOGLE_APPLICATION_CREDENTIALS

value: /etc/service-account/service-account.json

# docker-in-docker needs privileged mode

securityContext:

privileged: true

volumeMounts:

- name: service

mountPath: /etc/service-account

readOnly: true

- name: cache-ssd

mountPath: /root/.cache

- name: docker-graph

mountPath: /docker-graph

ports:

- containerPort: 9999

hostPort: 9999

resources:

requests:

cpu: 4

volumes:

- name: service

secret:

secretName: service-account

- name: cache-ssd

hostPath:

path: /mnt/disks/ssd0

- name: docker-graph

hostPath:

path: /mnt/disks/ssd0/docker-graph

保存された差分

原文

ファイルを開く

- name: pull-kubernetes-unit
    agent: kubernetes
    branches:
    - release-1.6
    - release-1.7
    - release-1.8
    always_run: true
    context: pull-kubernetes-unit
    rerun_command: "/test pull-kubernetes-unit"
    trigger: "(?m)^/test( all| pull-kubernetes-unit),?(\\s+|$)"
    spec:
      containers:
      - image: gcr.io/k8s-testimages/bootstrap:v20171127-a1522ede
        args:
        - "--clean"
        - "--git-cache=/root/.cache/git"
        - "--job=$(JOB_NAME)"
        - "--repo=k8s.io/$(REPO_NAME)=$(PULL_REFS)"
        - "--service-account=/etc/service-account/service-account.json"
        - "--upload=gs://kubernetes-jenkins/pr-logs"
        - "--timeout=60"
        env:
        - name: DOCKER_IN_DOCKER_ENABLED
          value: true
        - name: GOOGLE_APPLICATION_CREDENTIALS
          value: /etc/service-account/service-account.json
        # docker-in-docker needs privileged mode
        securityContext:
          privileged: true
        volumeMounts:
        - name: service
          mountPath: /etc/service-account
          readOnly: true
        - name: cache-ssd
          mountPath: /root/.cache
        - name: docker-graph
          mountPath: /docker-graph
        ports:
        - containerPort: 9999
          hostPort: 9999
        resources:
          requests:
            cpu: 4
      volumes:
      - name: service
        secret:
          secretName: service-account
      - name: cache-ssd
        hostPath:
          path: /mnt/disks/ssd0
      - name: docker-graph
        hostPath:
          path: /mnt/disks/ssd0/docker-graph

変更されたテキスト

ファイルを開く

- name: pull-kubernetes-unit-prow
    agent: kubernetes
    always_run: false
    context: pull-kubernetes-unit-prow
    rerun_command: "/test pull-kubernetes-unit-prow"
    trigger: "(?m)^/test pull-kubernetes-unit-prow,?(\\s+|$)"
    spec:
      containers:
      - image: gcr.io/k8s-testimages/bootstrap:latest
        imagePullPolicy: Always
        args:
        - "--clean"
        - "--git-cache=/root/.cache/git"
        - "--job=$(JOB_NAME)"
        - "--repo=k8s.io/$(REPO_NAME)=$(PULL_REFS)"
        - "--service-account=/etc/service-account/service-account.json"
        - "--upload=gs://kubernetes-jenkins/pr-logs"
        - "--timeout=60"
        env:
        - name: DOCKER_IN_DOCKER_ENABLED
          value: true
        - name: GOOGLE_APPLICATION_CREDENTIALS
          value: /etc/service-account/service-account.json
        # docker-in-docker needs privileged mode
        securityContext:
          privileged: true
        volumeMounts:
        - name: service
          mountPath: /etc/service-account
          readOnly: true
        - name: cache-ssd
          mountPath: /root/.cache
        - name: docker-graph
          mountPath: /docker-graph
        ports:
        - containerPort: 9999
          hostPort: 9999
        resources:
          requests:
            cpu: 4
      volumes:
      - name: service
        secret:
          secretName: service-account
      - name: cache-ssd
        hostPath:
          path: /mnt/disks/ssd0
      - name: docker-graph
        hostPath:
          path: /mnt/disks/ssd0/docker-graph