Diff
checker
テキスト
テキスト
画像
ドキュメント
Excel
フォルダ
Legal
Enterprise
デスクトップ
料金
ログイン
Diffchecker デスクトップのダウンロード
テキスト比較
2 つのテキスト ファイルの違いを見つける
ツール
履歴
ライブエディター
空白の変更を非表示
未変更行を折りたたむ
折り返しなし
レイアウト
分割
統合
比較精度
スマート
単語
文字
テキストスタイル
外観を変更
シンタックスハイライト
構文を選択
無視
テキスト変換
最初の差分へ移動
入力を編集
Diffchecker Desktop
Diffcheckerを実行する最も安全な方法。Diffchecker Desktopアプリを入手:あなたの差分はコンピューターから出ることはありません!
Desktopを入手
Untitled diff
作成日
7 年前
差分は期限切れになりません
クリア
エクスポート
共有
説明
5 削除
行
合計
削除
文字
合計
削除
この機能を引き続き使用するには、アップグレードしてください
Diff
checker
Pro
価格を見る
470 行
すべてコピー
76 追加
行
合計
追加
文字
合計
追加
この機能を引き続き使用するには、アップグレードしてください
Diff
checker
Pro
価格を見る
531 行
すべてコピー
コピー
コピー済み
コピー
コピー済み
---
apiVersion: extensions/v1beta1
kind: PodSecurityPolicy
metadata:
name: psp.flannel.unprivileged
annotations:
seccomp.security.alpha.kubernetes.io/allowedProfileNames: docker/default
seccomp.security.alpha.kubernetes.io/defaultProfileName: docker/default
apparmor.security.beta.kubernetes.io/allowedProfileNames: runtime/default
apparmor.security.beta.kubernetes.io/defaultProfileName: runtime/default
spec:
privileged: false
volumes:
- configMap
- secret
- emptyDir
- hostPath
allowedHostPaths:
- pathPrefix: "/etc/cni/net.d"
- pathPrefix: "/etc/kube-flannel"
- pathPrefix: "/run/flannel"
readOnlyRootFilesystem: false
# Users and groups
runAsUser:
rule: RunAsAny
supplementalGroups:
rule: RunAsAny
fsGroup:
rule: RunAsAny
# Privilege Escalation
allowPrivilegeEscalation: false
defaultAllowPrivilegeEscalation: false
# Capabilities
allowedCapabilities: ['NET_ADMIN']
defaultAddCapabilities: []
requiredDropCapabilities: []
# Host namespaces
hostPID: false
hostIPC: false
hostNetwork: true
hostPorts:
- min: 0
max: 65535
# SELinux
seLinux:
# SELinux is unsed in CaaSP
rule: 'RunAsAny'
---
---
kind: ClusterRole
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1beta1
apiVersion: rbac.authorization.k8s.io/v1beta1
metadata:
metadata:
name: flannel
name: flannel
rules:
rules:
コピー
コピー済み
コピー
コピー済み
- apiGroups: ['extensions']
resources: ['podsecuritypolicies']
verbs: ['use']
resourceNames: ['psp.flannel.unprivileged']
- apiGroups:
- apiGroups:
- ""
- ""
resources:
resources:
- pods
- pods
verbs:
verbs:
- get
- get
- apiGroups:
- apiGroups:
- ""
- ""
resources:
resources:
- nodes
- nodes
verbs:
verbs:
- list
- list
- watch
- watch
- apiGroups:
- apiGroups:
- ""
- ""
resources:
resources:
- nodes/status
- nodes/status
verbs:
verbs:
- patch
- patch
---
---
kind: ClusterRoleBinding
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1beta1
apiVersion: rbac.authorization.k8s.io/v1beta1
metadata:
metadata:
name: flannel
name: flannel
roleRef:
roleRef:
apiGroup: rbac.authorization.k8s.io
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
kind: ClusterRole
name: flannel
name: flannel
subjects:
subjects:
- kind: ServiceAccount
- kind: ServiceAccount
name: flannel
name: flannel
namespace: kube-system
namespace: kube-system
---
---
apiVersion: v1
apiVersion: v1
kind: ServiceAccount
kind: ServiceAccount
metadata:
metadata:
name: flannel
name: flannel
namespace: kube-system
namespace: kube-system
---
---
kind: ConfigMap
kind: ConfigMap
apiVersion: v1
apiVersion: v1
metadata:
metadata:
name: kube-flannel-cfg
name: kube-flannel-cfg
namespace: kube-system
namespace: kube-system
labels:
labels:
tier: node
tier: node
app: flannel
app: flannel
data:
data:
cni-conf.json: |
cni-conf.json: |
{
{
"name": "cbr0",
"name": "cbr0",
"plugins": [
"plugins": [
{
{
"type": "flannel",
"type": "flannel",
"delegate": {
"delegate": {
"hairpinMode": true,
"hairpinMode": true,
"isDefaultGateway": true
"isDefaultGateway": true
}
}
},
},
{
{
"type": "portmap",
"type": "portmap",
"capabilities": {
"capabilities": {
"portMappings": true
"portMappings": true
}
}
}
}
]
]
}
}
net-conf.json: |
net-conf.json: |
{
{
"Network": "10.244.0.0/16",
"Network": "10.244.0.0/16",
"Backend": {
"Backend": {
"Type": "vxlan"
"Type": "vxlan"
}
}
}
}
---
---
apiVersion: extensions/v1beta1
apiVersion: extensions/v1beta1
kind: DaemonSet
kind: DaemonSet
metadata:
metadata:
name: kube-flannel-ds-amd64
name: kube-flannel-ds-amd64
namespace: kube-system
namespace: kube-system
labels:
labels:
tier: node
tier: node
app: flannel
app: flannel
spec:
spec:
template:
template:
metadata:
metadata:
labels:
labels:
tier: node
tier: node
app: flannel
app: flannel
spec:
spec:
hostNetwork: true
hostNetwork: true
nodeSelector:
nodeSelector:
beta.kubernetes.io/arch: amd64
beta.kubernetes.io/arch: amd64
tolerations:
tolerations:
- operator: Exists
- operator: Exists
effect: NoSchedule
effect: NoSchedule
serviceAccountName: flannel
serviceAccountName: flannel
initContainers:
initContainers:
- name: install-cni
- name: install-cni
image: quay.io/coreos/flannel:v0.11.0-amd64
image: quay.io/coreos/flannel:v0.11.0-amd64
command:
command:
- cp
- cp
args:
args:
- -f
- -f
- /etc/kube-flannel/cni-conf.json
- /etc/kube-flannel/cni-conf.json
- /etc/cni/net.d/10-flannel.conflist
- /etc/cni/net.d/10-flannel.conflist
volumeMounts:
volumeMounts:
- name: cni
- name: cni
mountPath: /etc/cni/net.d
mountPath: /etc/cni/net.d
- name: flannel-cfg
- name: flannel-cfg
mountPath: /etc/kube-flannel/
mountPath: /etc/kube-flannel/
containers:
containers:
- name: kube-flannel
- name: kube-flannel
image: quay.io/coreos/flannel:v0.11.0-amd64
image: quay.io/coreos/flannel:v0.11.0-amd64
command:
command:
- /opt/bin/flanneld
- /opt/bin/flanneld
args:
args:
- --ip-masq
- --ip-masq
- --kube-subnet-mgr
- --kube-subnet-mgr
resources:
resources:
requests:
requests:
cpu: "100m"
cpu: "100m"
memory: "50Mi"
memory: "50Mi"
limits:
limits:
cpu: "100m"
cpu: "100m"
memory: "50Mi"
memory: "50Mi"
securityContext:
securityContext:
コピー
コピー済み
コピー
コピー済み
privileged:
true
privileged:
false
capabilities:
add: ["NET_ADMIN"]
env:
env:
- name: POD_NAME
- name: POD_NAME
valueFrom:
valueFrom:
fieldRef:
fieldRef:
fieldPath: metadata.name
fieldPath: metadata.name
- name: POD_NAMESPACE
- name: POD_NAMESPACE
valueFrom:
valueFrom:
fieldRef:
fieldRef:
fieldPath: metadata.namespace
fieldPath: metadata.namespace
volumeMounts:
volumeMounts:
- name: run
- name: run
コピー
コピー済み
コピー
コピー済み
mountPath: /run
mountPath: /run
/flannel
- name: flannel-cfg
- name: flannel-cfg
mountPath: /etc/kube-flannel/
mountPath: /etc/kube-flannel/
volumes:
volumes:
- name: run
- name: run
hostPath:
hostPath:
コピー
コピー済み
コピー
コピー済み
path: /run
path: /run
/flannel
- name: cni
- name: cni
hostPath:
hostPath:
path: /etc/cni/net.d
path: /etc/cni/net.d
- name: flannel-cfg
- name: flannel-cfg
configMap:
configMap:
name: kube-flannel-cfg
name: kube-flannel-cfg
---
---
apiVersion: extensions/v1beta1
apiVersion: extensions/v1beta1
kind: DaemonSet
kind: DaemonSet
metadata:
metadata:
name: kube-flannel-ds-arm64
name: kube-flannel-ds-arm64
namespace: kube-system
namespace: kube-system
labels:
labels:
tier: node
tier: node
app: flannel
app: flannel
spec:
spec:
template:
template:
metadata:
metadata:
labels:
labels:
tier: node
tier: node
app: flannel
app: flannel
spec:
spec:
hostNetwork: true
hostNetwork: true
nodeSelector:
nodeSelector:
beta.kubernetes.io/arch: arm64
beta.kubernetes.io/arch: arm64
tolerations:
tolerations:
- operator: Exists
- operator: Exists
effect: NoSchedule
effect: NoSchedule
serviceAccountName: flannel
serviceAccountName: flannel
initContainers:
initContainers:
- name: install-cni
- name: install-cni
image: quay.io/coreos/flannel:v0.11.0-arm64
image: quay.io/coreos/flannel:v0.11.0-arm64
command:
command:
- cp
- cp
args:
args:
- -f
- -f
- /etc/kube-flannel/cni-conf.json
- /etc/kube-flannel/cni-conf.json
- /etc/cni/net.d/10-flannel.conflist
- /etc/cni/net.d/10-flannel.conflist
volumeMounts:
volumeMounts:
- name: cni
- name: cni
mountPath: /etc/cni/net.d
mountPath: /etc/cni/net.d
- name: flannel-cfg
- name: flannel-cfg
mountPath: /etc/kube-flannel/
mountPath: /etc/kube-flannel/
containers:
containers:
- name: kube-flannel
- name: kube-flannel
image: quay.io/coreos/flannel:v0.11.0-arm64
image: quay.io/coreos/flannel:v0.11.0-arm64
command:
command:
- /opt/bin/flanneld
- /opt/bin/flanneld
args:
args:
- --ip-masq
- --ip-masq
- --kube-subnet-mgr
- --kube-subnet-mgr
resources:
resources:
requests:
requests:
cpu: "100m"
cpu: "100m"
memory: "50Mi"
memory: "50Mi"
limits:
limits:
cpu: "100m"
cpu: "100m"
memory: "50Mi"
memory: "50Mi"
securityContext:
securityContext:
コピー
コピー済み
コピー
コピー済み
privileged:
true
privileged:
false
capabilities:
add: ["NET_ADMIN"]
env:
env:
- name: POD_NAME
- name: POD_NAME
valueFrom:
valueFrom:
fieldRef:
fieldRef:
fieldPath: metadata.name
fieldPath: metadata.name
- name: POD_NAMESPACE
- name: POD_NAMESPACE
valueFrom:
valueFrom:
fieldRef:
fieldRef:
fieldPath: metadata.namespace
fieldPath: metadata.namespace
volumeMounts:
volumeMounts:
- name: run
- name: run
コピー
コピー済み
コピー
コピー済み
mountPath: /run
mountPath: /run
/flannel
- name: flannel-cfg
- name: flannel-cfg
mountPath: /etc/kube-flannel/
mountPath: /etc/kube-flannel/
volumes:
volumes:
- name: run
- name: run
hostPath:
hostPath:
コピー
コピー済み
コピー
コピー済み
path: /run
path: /run
/flannel
- name: cni
- name: cni
hostPath:
hostPath:
path: /etc/cni/net.d
path: /etc/cni/net.d
- name: flannel-cfg
- name: flannel-cfg
configMap:
configMap:
name: kube-flannel-cfg
name: kube-flannel-cfg
---
---
apiVersion: extensions/v1beta1
apiVersion: extensions/v1beta1
kind: DaemonSet
kind: DaemonSet
metadata:
metadata:
name: kube-flannel-ds-arm
name: kube-flannel-ds-arm
namespace: kube-system
namespace: kube-system
labels:
labels:
tier: node
tier: node
app: flannel
app: flannel
spec:
spec:
template:
template:
metadata:
metadata:
labels:
labels:
tier: node
tier: node
app: flannel
app: flannel
spec:
spec:
hostNetwork: true
hostNetwork: true
nodeSelector:
nodeSelector:
beta.kubernetes.io/arch: arm
beta.kubernetes.io/arch: arm
tolerations:
tolerations:
- operator: Exists
- operator: Exists
effect: NoSchedule
effect: NoSchedule
serviceAccountName: flannel
serviceAccountName: flannel
initContainers:
initContainers:
- name: install-cni
- name: install-cni
image: quay.io/coreos/flannel:v0.11.0-arm
image: quay.io/coreos/flannel:v0.11.0-arm
command:
command:
- cp
- cp
args:
args:
- -f
- -f
- /etc/kube-flannel/cni-conf.json
- /etc/kube-flannel/cni-conf.json
- /etc/cni/net.d/10-flannel.conflist
- /etc/cni/net.d/10-flannel.conflist
volumeMounts:
volumeMounts:
- name: cni
- name: cni
mountPath: /etc/cni/net.d
mountPath: /etc/cni/net.d
- name: flannel-cfg
- name: flannel-cfg
mountPath: /etc/kube-flannel/
mountPath: /etc/kube-flannel/
containers:
containers:
- name: kube-flannel
- name: kube-flannel
image: quay.io/coreos/flannel:v0.11.0-arm
image: quay.io/coreos/flannel:v0.11.0-arm
command:
command:
- /opt/bin/flanneld
- /opt/bin/flanneld
args:
args:
- --ip-masq
- --ip-masq
- --kube-subnet-mgr
- --kube-subnet-mgr
resources:
resources:
requests:
requests:
cpu: "100m"
cpu: "100m"
memory: "50Mi"
memory: "50Mi"
limits:
limits:
cpu: "100m"
cpu: "100m"
memory: "50Mi"
memory: "50Mi"
securityContext:
securityContext:
コピー
コピー済み
コピー
コピー済み
privileged:
true
privileged:
false
capabilities:
add: ["NET_ADMIN"]
env:
env:
- name: POD_NAME
- name: POD_NAME
valueFrom:
valueFrom:
fieldRef:
fieldRef:
fieldPath: metadata.name
fieldPath: metadata.name
- name: POD_NAMESPACE
- name: POD_NAMESPACE
valueFrom:
valueFrom:
fieldRef:
fieldRef:
fieldPath: metadata.namespace
fieldPath: metadata.namespace
volumeMounts:
volumeMounts:
- name: run
- name: run
コピー
コピー済み
コピー
コピー済み
mountPath: /run
mountPath: /run
/flannel
- name: flannel-cfg
- name: flannel-cfg
mountPath: /etc/kube-flannel/
mountPath: /etc/kube-flannel/
volumes:
volumes:
- name: run
- name: run
hostPath:
hostPath:
コピー
コピー済み
コピー
コピー済み
path: /run
path: /run
/flannel
- name: cni
- name: cni
hostPath:
hostPath:
path: /etc/cni/net.d
path: /etc/cni/net.d
- name: flannel-cfg
- name: flannel-cfg
configMap:
configMap:
name: kube-flannel-cfg
name: kube-flannel-cfg
---
---
apiVersion: extensions/v1beta1
apiVersion: extensions/v1beta1
kind: DaemonSet
kind: DaemonSet
metadata:
metadata:
name: kube-flannel-ds-ppc64le
name: kube-flannel-ds-ppc64le
namespace: kube-system
namespace: kube-system
labels:
labels:
tier: node
tier: node
app: flannel
app: flannel
spec:
spec:
template:
template:
metadata:
metadata:
labels:
labels:
tier: node
tier: node
app: flannel
app: flannel
spec:
spec:
hostNetwork: true
hostNetwork: true
nodeSelector:
nodeSelector:
beta.kubernetes.io/arch: ppc64le
beta.kubernetes.io/arch: ppc64le
tolerations:
tolerations:
- operator: Exists
- operator: Exists
effect: NoSchedule
effect: NoSchedule
serviceAccountName: flannel
serviceAccountName: flannel
initContainers:
initContainers:
- name: install-cni
- name: install-cni
image: quay.io/coreos/flannel:v0.11.0-ppc64le
image: quay.io/coreos/flannel:v0.11.0-ppc64le
command:
command:
- cp
- cp
args:
args:
- -f
- -f
- /etc/kube-flannel/cni-conf.json
- /etc/kube-flannel/cni-conf.json
- /etc/cni/net.d/10-flannel.conflist
- /etc/cni/net.d/10-flannel.conflist
volumeMounts:
volumeMounts:
- name: cni
- name: cni
mountPath: /etc/cni/net.d
mountPath: /etc/cni/net.d
- name: flannel-cfg
- name: flannel-cfg
mountPath: /etc/kube-flannel/
mountPath: /etc/kube-flannel/
containers:
containers:
- name: kube-flannel
- name: kube-flannel
image: quay.io/coreos/flannel:v0.11.0-ppc64le
image: quay.io/coreos/flannel:v0.11.0-ppc64le
command:
command:
- /opt/bin/flanneld
- /opt/bin/flanneld
args:
args:
- --ip-masq
- --ip-masq
- --kube-subnet-mgr
- --kube-subnet-mgr
resources:
resources:
requests:
requests:
cpu: "100m"
cpu: "100m"
memory: "50Mi"
memory: "50Mi"
limits:
limits:
cpu: "100m"
cpu: "100m"
memory: "50Mi"
memory: "50Mi"
securityContext:
securityContext:
コピー
コピー済み
コピー
コピー済み
privileged:
true
privileged:
false
capabilities:
add: ["NET_ADMIN"]
env:
env:
- name: POD_NAME
- name: POD_NAME
valueFrom:
valueFrom:
fieldRef:
fieldRef:
fieldPath: metadata.name
fieldPath: metadata.name
- name: POD_NAMESPACE
- name: POD_NAMESPACE
valueFrom:
valueFrom:
fieldRef:
fieldRef:
fieldPath: metadata.namespace
fieldPath: metadata.namespace
volumeMounts:
volumeMounts:
- name: run
- name: run
コピー
コピー済み
コピー
コピー済み
mountPath: /run
mountPath: /run
/flannel
- name: flannel-cfg
- name: flannel-cfg
mountPath: /etc/kube-flannel/
mountPath: /etc/kube-flannel/
volumes:
volumes:
- name: run
- name: run
hostPath:
hostPath:
コピー
コピー済み
コピー
コピー済み
path: /run
path: /run
/flannel
- name: cni
- name: cni
hostPath:
hostPath:
path: /etc/cni/net.d
path: /etc/cni/net.d
- name: flannel-cfg
- name: flannel-cfg
configMap:
configMap:
name: kube-flannel-cfg
name: kube-flannel-cfg
---
---
apiVersion: extensions/v1beta1
apiVersion: extensions/v1beta1
kind: DaemonSet
kind: DaemonSet
metadata:
metadata:
name: kube-flannel-ds-s390x
name: kube-flannel-ds-s390x
namespace: kube-system
namespace: kube-system
labels:
labels:
tier: node
tier: node
app: flannel
app: flannel
spec:
spec:
template:
template:
metadata:
metadata:
labels:
labels:
tier: node
tier: node
app: flannel
app: flannel
spec:
spec:
hostNetwork: true
hostNetwork: true
nodeSelector:
nodeSelector:
beta.kubernetes.io/arch: s390x
beta.kubernetes.io/arch: s390x
tolerations:
tolerations:
- operator: Exists
- operator: Exists
effect: NoSchedule
effect: NoSchedule
serviceAccountName: flannel
serviceAccountName: flannel
initContainers:
initContainers:
- name: install-cni
- name: install-cni
image: quay.io/coreos/flannel:v0.11.0-s390x
image: quay.io/coreos/flannel:v0.11.0-s390x
command:
command:
- cp
- cp
args:
args:
- -f
- -f
- /etc/kube-flannel/cni-conf.json
- /etc/kube-flannel/cni-conf.json
- /etc/cni/net.d/10-flannel.conflist
- /etc/cni/net.d/10-flannel.conflist
volumeMounts:
volumeMounts:
- name: cni
- name: cni
mountPath: /etc/cni/net.d
mountPath: /etc/cni/net.d
- name: flannel-cfg
- name: flannel-cfg
mountPath: /etc/kube-flannel/
mountPath: /etc/kube-flannel/
containers:
containers:
- name: kube-flannel
- name: kube-flannel
image: quay.io/coreos/flannel:v0.11.0-s390x
image: quay.io/coreos/flannel:v0.11.0-s390x
command:
command:
- /opt/bin/flanneld
- /opt/bin/flanneld
args:
args:
- --ip-masq
- --ip-masq
- --kube-subnet-mgr
- --kube-subnet-mgr
resources:
resources:
requests:
requests:
cpu: "100m"
cpu: "100m"
memory: "50Mi"
memory: "50Mi"
limits:
limits:
cpu: "100m"
cpu: "100m"
memory: "50Mi"
memory: "50Mi"
securityContext:
securityContext:
コピー
コピー済み
コピー
コピー済み
privileged:
true
privileged:
false
capabilities:
add: ["NET_ADMIN"]
env:
env:
- name: POD_NAME
- name: POD_NAME
valueFrom:
valueFrom:
fieldRef:
fieldRef:
fieldPath: metadata.name
fieldPath: metadata.name
- name: POD_NAMESPACE
- name: POD_NAMESPACE
valueFrom:
valueFrom:
fieldRef:
fieldRef:
fieldPath: metadata.namespace
fieldPath: metadata.namespace
volumeMounts:
volumeMounts:
- name: run
- name: run
コピー
コピー済み
コピー
コピー済み
mountPath: /run
mountPath: /run
/flannel
- name: flannel-cfg
- name: flannel-cfg
mountPath: /etc/kube-flannel/
mountPath: /etc/kube-flannel/
volumes:
volumes:
- name: run
- name: run
hostPath:
hostPath:
コピー
コピー済み
コピー
コピー済み
path: /run
path: /run
/flannel
- name: cni
- name: cni
hostPath:
hostPath:
path: /etc/cni/net.d
path: /etc/cni/net.d
- name: flannel-cfg
- name: flannel-cfg
configMap:
configMap:
name: kube-flannel-cfg
name: kube-flannel-cfg
保存された差分
原文
ファイルを開く
--- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1beta1 metadata: name: flannel rules: - apiGroups: - "" resources: - pods verbs: - get - apiGroups: - "" resources: - nodes verbs: - list - watch - apiGroups: - "" resources: - nodes/status verbs: - patch --- kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1beta1 metadata: name: flannel roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole name: flannel subjects: - kind: ServiceAccount name: flannel namespace: kube-system --- apiVersion: v1 kind: ServiceAccount metadata: name: flannel namespace: kube-system --- kind: ConfigMap apiVersion: v1 metadata: name: kube-flannel-cfg namespace: kube-system labels: tier: node app: flannel data: cni-conf.json: | { "name": "cbr0", "plugins": [ { "type": "flannel", "delegate": { "hairpinMode": true, "isDefaultGateway": true } }, { "type": "portmap", "capabilities": { "portMappings": true } } ] } net-conf.json: | { "Network": "10.244.0.0/16", "Backend": { "Type": "vxlan" } } --- apiVersion: extensions/v1beta1 kind: DaemonSet metadata: name: kube-flannel-ds-amd64 namespace: kube-system labels: tier: node app: flannel spec: template: metadata: labels: tier: node app: flannel spec: hostNetwork: true nodeSelector: beta.kubernetes.io/arch: amd64 tolerations: - operator: Exists effect: NoSchedule serviceAccountName: flannel initContainers: - name: install-cni image: quay.io/coreos/flannel:v0.11.0-amd64 command: - cp args: - -f - /etc/kube-flannel/cni-conf.json - /etc/cni/net.d/10-flannel.conflist volumeMounts: - name: cni mountPath: /etc/cni/net.d - name: flannel-cfg mountPath: /etc/kube-flannel/ containers: - name: kube-flannel image: quay.io/coreos/flannel:v0.11.0-amd64 command: - /opt/bin/flanneld args: - --ip-masq - --kube-subnet-mgr resources: requests: cpu: "100m" memory: "50Mi" limits: cpu: "100m" memory: "50Mi" securityContext: privileged: true env: - name: POD_NAME valueFrom: fieldRef: fieldPath: metadata.name - name: POD_NAMESPACE valueFrom: fieldRef: fieldPath: metadata.namespace volumeMounts: - name: run mountPath: /run - name: flannel-cfg mountPath: /etc/kube-flannel/ volumes: - name: run hostPath: path: /run - name: cni hostPath: path: /etc/cni/net.d - name: flannel-cfg configMap: name: kube-flannel-cfg --- apiVersion: extensions/v1beta1 kind: DaemonSet metadata: name: kube-flannel-ds-arm64 namespace: kube-system labels: tier: node app: flannel spec: template: metadata: labels: tier: node app: flannel spec: hostNetwork: true nodeSelector: beta.kubernetes.io/arch: arm64 tolerations: - operator: Exists effect: NoSchedule serviceAccountName: flannel initContainers: - name: install-cni image: quay.io/coreos/flannel:v0.11.0-arm64 command: - cp args: - -f - /etc/kube-flannel/cni-conf.json - /etc/cni/net.d/10-flannel.conflist volumeMounts: - name: cni mountPath: /etc/cni/net.d - name: flannel-cfg mountPath: /etc/kube-flannel/ containers: - name: kube-flannel image: quay.io/coreos/flannel:v0.11.0-arm64 command: - /opt/bin/flanneld args: - --ip-masq - --kube-subnet-mgr resources: requests: cpu: "100m" memory: "50Mi" limits: cpu: "100m" memory: "50Mi" securityContext: privileged: true env: - name: POD_NAME valueFrom: fieldRef: fieldPath: metadata.name - name: POD_NAMESPACE valueFrom: fieldRef: fieldPath: metadata.namespace volumeMounts: - name: run mountPath: /run - name: flannel-cfg mountPath: /etc/kube-flannel/ volumes: - name: run hostPath: path: /run - name: cni hostPath: path: /etc/cni/net.d - name: flannel-cfg configMap: name: kube-flannel-cfg --- apiVersion: extensions/v1beta1 kind: DaemonSet metadata: name: kube-flannel-ds-arm namespace: kube-system labels: tier: node app: flannel spec: template: metadata: labels: tier: node app: flannel spec: hostNetwork: true nodeSelector: beta.kubernetes.io/arch: arm tolerations: - operator: Exists effect: NoSchedule serviceAccountName: flannel initContainers: - name: install-cni image: quay.io/coreos/flannel:v0.11.0-arm command: - cp args: - -f - /etc/kube-flannel/cni-conf.json - /etc/cni/net.d/10-flannel.conflist volumeMounts: - name: cni mountPath: /etc/cni/net.d - name: flannel-cfg mountPath: /etc/kube-flannel/ containers: - name: kube-flannel image: quay.io/coreos/flannel:v0.11.0-arm command: - /opt/bin/flanneld args: - --ip-masq - --kube-subnet-mgr resources: requests: cpu: "100m" memory: "50Mi" limits: cpu: "100m" memory: "50Mi" securityContext: privileged: true env: - name: POD_NAME valueFrom: fieldRef: fieldPath: metadata.name - name: POD_NAMESPACE valueFrom: fieldRef: fieldPath: metadata.namespace volumeMounts: - name: run mountPath: /run - name: flannel-cfg mountPath: /etc/kube-flannel/ volumes: - name: run hostPath: path: /run - name: cni hostPath: path: /etc/cni/net.d - name: flannel-cfg configMap: name: kube-flannel-cfg --- apiVersion: extensions/v1beta1 kind: DaemonSet metadata: name: kube-flannel-ds-ppc64le namespace: kube-system labels: tier: node app: flannel spec: template: metadata: labels: tier: node app: flannel spec: hostNetwork: true nodeSelector: beta.kubernetes.io/arch: ppc64le tolerations: - operator: Exists effect: NoSchedule serviceAccountName: flannel initContainers: - name: install-cni image: quay.io/coreos/flannel:v0.11.0-ppc64le command: - cp args: - -f - /etc/kube-flannel/cni-conf.json - /etc/cni/net.d/10-flannel.conflist volumeMounts: - name: cni mountPath: /etc/cni/net.d - name: flannel-cfg mountPath: /etc/kube-flannel/ containers: - name: kube-flannel image: quay.io/coreos/flannel:v0.11.0-ppc64le command: - /opt/bin/flanneld args: - --ip-masq - --kube-subnet-mgr resources: requests: cpu: "100m" memory: "50Mi" limits: cpu: "100m" memory: "50Mi" securityContext: privileged: true env: - name: POD_NAME valueFrom: fieldRef: fieldPath: metadata.name - name: POD_NAMESPACE valueFrom: fieldRef: fieldPath: metadata.namespace volumeMounts: - name: run mountPath: /run - name: flannel-cfg mountPath: /etc/kube-flannel/ volumes: - name: run hostPath: path: /run - name: cni hostPath: path: /etc/cni/net.d - name: flannel-cfg configMap: name: kube-flannel-cfg --- apiVersion: extensions/v1beta1 kind: DaemonSet metadata: name: kube-flannel-ds-s390x namespace: kube-system labels: tier: node app: flannel spec: template: metadata: labels: tier: node app: flannel spec: hostNetwork: true nodeSelector: beta.kubernetes.io/arch: s390x tolerations: - operator: Exists effect: NoSchedule serviceAccountName: flannel initContainers: - name: install-cni image: quay.io/coreos/flannel:v0.11.0-s390x command: - cp args: - -f - /etc/kube-flannel/cni-conf.json - /etc/cni/net.d/10-flannel.conflist volumeMounts: - name: cni mountPath: /etc/cni/net.d - name: flannel-cfg mountPath: /etc/kube-flannel/ containers: - name: kube-flannel image: quay.io/coreos/flannel:v0.11.0-s390x command: - /opt/bin/flanneld args: - --ip-masq - --kube-subnet-mgr resources: requests: cpu: "100m" memory: "50Mi" limits: cpu: "100m" memory: "50Mi" securityContext: privileged: true env: - name: POD_NAME valueFrom: fieldRef: fieldPath: metadata.name - name: POD_NAMESPACE valueFrom: fieldRef: fieldPath: metadata.namespace volumeMounts: - name: run mountPath: /run - name: flannel-cfg mountPath: /etc/kube-flannel/ volumes: - name: run hostPath: path: /run - name: cni hostPath: path: /etc/cni/net.d - name: flannel-cfg configMap: name: kube-flannel-cfg
変更されたテキスト
ファイルを開く
--- apiVersion: extensions/v1beta1 kind: PodSecurityPolicy metadata: name: psp.flannel.unprivileged annotations: seccomp.security.alpha.kubernetes.io/allowedProfileNames: docker/default seccomp.security.alpha.kubernetes.io/defaultProfileName: docker/default apparmor.security.beta.kubernetes.io/allowedProfileNames: runtime/default apparmor.security.beta.kubernetes.io/defaultProfileName: runtime/default spec: privileged: false volumes: - configMap - secret - emptyDir - hostPath allowedHostPaths: - pathPrefix: "/etc/cni/net.d" - pathPrefix: "/etc/kube-flannel" - pathPrefix: "/run/flannel" readOnlyRootFilesystem: false # Users and groups runAsUser: rule: RunAsAny supplementalGroups: rule: RunAsAny fsGroup: rule: RunAsAny # Privilege Escalation allowPrivilegeEscalation: false defaultAllowPrivilegeEscalation: false # Capabilities allowedCapabilities: ['NET_ADMIN'] defaultAddCapabilities: [] requiredDropCapabilities: [] # Host namespaces hostPID: false hostIPC: false hostNetwork: true hostPorts: - min: 0 max: 65535 # SELinux seLinux: # SELinux is unsed in CaaSP rule: 'RunAsAny' --- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1beta1 metadata: name: flannel rules: - apiGroups: ['extensions'] resources: ['podsecuritypolicies'] verbs: ['use'] resourceNames: ['psp.flannel.unprivileged'] - apiGroups: - "" resources: - pods verbs: - get - apiGroups: - "" resources: - nodes verbs: - list - watch - apiGroups: - "" resources: - nodes/status verbs: - patch --- kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1beta1 metadata: name: flannel roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole name: flannel subjects: - kind: ServiceAccount name: flannel namespace: kube-system --- apiVersion: v1 kind: ServiceAccount metadata: name: flannel namespace: kube-system --- kind: ConfigMap apiVersion: v1 metadata: name: kube-flannel-cfg namespace: kube-system labels: tier: node app: flannel data: cni-conf.json: | { "name": "cbr0", "plugins": [ { "type": "flannel", "delegate": { "hairpinMode": true, "isDefaultGateway": true } }, { "type": "portmap", "capabilities": { "portMappings": true } } ] } net-conf.json: | { "Network": "10.244.0.0/16", "Backend": { "Type": "vxlan" } } --- apiVersion: extensions/v1beta1 kind: DaemonSet metadata: name: kube-flannel-ds-amd64 namespace: kube-system labels: tier: node app: flannel spec: template: metadata: labels: tier: node app: flannel spec: hostNetwork: true nodeSelector: beta.kubernetes.io/arch: amd64 tolerations: - operator: Exists effect: NoSchedule serviceAccountName: flannel initContainers: - name: install-cni image: quay.io/coreos/flannel:v0.11.0-amd64 command: - cp args: - -f - /etc/kube-flannel/cni-conf.json - /etc/cni/net.d/10-flannel.conflist volumeMounts: - name: cni mountPath: /etc/cni/net.d - name: flannel-cfg mountPath: /etc/kube-flannel/ containers: - name: kube-flannel image: quay.io/coreos/flannel:v0.11.0-amd64 command: - /opt/bin/flanneld args: - --ip-masq - --kube-subnet-mgr resources: requests: cpu: "100m" memory: "50Mi" limits: cpu: "100m" memory: "50Mi" securityContext: privileged: false capabilities: add: ["NET_ADMIN"] env: - name: POD_NAME valueFrom: fieldRef: fieldPath: metadata.name - name: POD_NAMESPACE valueFrom: fieldRef: fieldPath: metadata.namespace volumeMounts: - name: run mountPath: /run/flannel - name: flannel-cfg mountPath: /etc/kube-flannel/ volumes: - name: run hostPath: path: /run/flannel - name: cni hostPath: path: /etc/cni/net.d - name: flannel-cfg configMap: name: kube-flannel-cfg --- apiVersion: extensions/v1beta1 kind: DaemonSet metadata: name: kube-flannel-ds-arm64 namespace: kube-system labels: tier: node app: flannel spec: template: metadata: labels: tier: node app: flannel spec: hostNetwork: true nodeSelector: beta.kubernetes.io/arch: arm64 tolerations: - operator: Exists effect: NoSchedule serviceAccountName: flannel initContainers: - name: install-cni image: quay.io/coreos/flannel:v0.11.0-arm64 command: - cp args: - -f - /etc/kube-flannel/cni-conf.json - /etc/cni/net.d/10-flannel.conflist volumeMounts: - name: cni mountPath: /etc/cni/net.d - name: flannel-cfg mountPath: /etc/kube-flannel/ containers: - name: kube-flannel image: quay.io/coreos/flannel:v0.11.0-arm64 command: - /opt/bin/flanneld args: - --ip-masq - --kube-subnet-mgr resources: requests: cpu: "100m" memory: "50Mi" limits: cpu: "100m" memory: "50Mi" securityContext: privileged: false capabilities: add: ["NET_ADMIN"] env: - name: POD_NAME valueFrom: fieldRef: fieldPath: metadata.name - name: POD_NAMESPACE valueFrom: fieldRef: fieldPath: metadata.namespace volumeMounts: - name: run mountPath: /run/flannel - name: flannel-cfg mountPath: /etc/kube-flannel/ volumes: - name: run hostPath: path: /run/flannel - name: cni hostPath: path: /etc/cni/net.d - name: flannel-cfg configMap: name: kube-flannel-cfg --- apiVersion: extensions/v1beta1 kind: DaemonSet metadata: name: kube-flannel-ds-arm namespace: kube-system labels: tier: node app: flannel spec: template: metadata: labels: tier: node app: flannel spec: hostNetwork: true nodeSelector: beta.kubernetes.io/arch: arm tolerations: - operator: Exists effect: NoSchedule serviceAccountName: flannel initContainers: - name: install-cni image: quay.io/coreos/flannel:v0.11.0-arm command: - cp args: - -f - /etc/kube-flannel/cni-conf.json - /etc/cni/net.d/10-flannel.conflist volumeMounts: - name: cni mountPath: /etc/cni/net.d - name: flannel-cfg mountPath: /etc/kube-flannel/ containers: - name: kube-flannel image: quay.io/coreos/flannel:v0.11.0-arm command: - /opt/bin/flanneld args: - --ip-masq - --kube-subnet-mgr resources: requests: cpu: "100m" memory: "50Mi" limits: cpu: "100m" memory: "50Mi" securityContext: privileged: false capabilities: add: ["NET_ADMIN"] env: - name: POD_NAME valueFrom: fieldRef: fieldPath: metadata.name - name: POD_NAMESPACE valueFrom: fieldRef: fieldPath: metadata.namespace volumeMounts: - name: run mountPath: /run/flannel - name: flannel-cfg mountPath: /etc/kube-flannel/ volumes: - name: run hostPath: path: /run/flannel - name: cni hostPath: path: /etc/cni/net.d - name: flannel-cfg configMap: name: kube-flannel-cfg --- apiVersion: extensions/v1beta1 kind: DaemonSet metadata: name: kube-flannel-ds-ppc64le namespace: kube-system labels: tier: node app: flannel spec: template: metadata: labels: tier: node app: flannel spec: hostNetwork: true nodeSelector: beta.kubernetes.io/arch: ppc64le tolerations: - operator: Exists effect: NoSchedule serviceAccountName: flannel initContainers: - name: install-cni image: quay.io/coreos/flannel:v0.11.0-ppc64le command: - cp args: - -f - /etc/kube-flannel/cni-conf.json - /etc/cni/net.d/10-flannel.conflist volumeMounts: - name: cni mountPath: /etc/cni/net.d - name: flannel-cfg mountPath: /etc/kube-flannel/ containers: - name: kube-flannel image: quay.io/coreos/flannel:v0.11.0-ppc64le command: - /opt/bin/flanneld args: - --ip-masq - --kube-subnet-mgr resources: requests: cpu: "100m" memory: "50Mi" limits: cpu: "100m" memory: "50Mi" securityContext: privileged: false capabilities: add: ["NET_ADMIN"] env: - name: POD_NAME valueFrom: fieldRef: fieldPath: metadata.name - name: POD_NAMESPACE valueFrom: fieldRef: fieldPath: metadata.namespace volumeMounts: - name: run mountPath: /run/flannel - name: flannel-cfg mountPath: /etc/kube-flannel/ volumes: - name: run hostPath: path: /run/flannel - name: cni hostPath: path: /etc/cni/net.d - name: flannel-cfg configMap: name: kube-flannel-cfg --- apiVersion: extensions/v1beta1 kind: DaemonSet metadata: name: kube-flannel-ds-s390x namespace: kube-system labels: tier: node app: flannel spec: template: metadata: labels: tier: node app: flannel spec: hostNetwork: true nodeSelector: beta.kubernetes.io/arch: s390x tolerations: - operator: Exists effect: NoSchedule serviceAccountName: flannel initContainers: - name: install-cni image: quay.io/coreos/flannel:v0.11.0-s390x command: - cp args: - -f - /etc/kube-flannel/cni-conf.json - /etc/cni/net.d/10-flannel.conflist volumeMounts: - name: cni mountPath: /etc/cni/net.d - name: flannel-cfg mountPath: /etc/kube-flannel/ containers: - name: kube-flannel image: quay.io/coreos/flannel:v0.11.0-s390x command: - /opt/bin/flanneld args: - --ip-masq - --kube-subnet-mgr resources: requests: cpu: "100m" memory: "50Mi" limits: cpu: "100m" memory: "50Mi" securityContext: privileged: false capabilities: add: ["NET_ADMIN"] env: - name: POD_NAME valueFrom: fieldRef: fieldPath: metadata.name - name: POD_NAMESPACE valueFrom: fieldRef: fieldPath: metadata.namespace volumeMounts: - name: run mountPath: /run/flannel - name: flannel-cfg mountPath: /etc/kube-flannel/ volumes: - name: run hostPath: path: /run/flannel - name: cni hostPath: path: /etc/cni/net.d - name: flannel-cfg configMap: name: kube-flannel-cfg
違いを見つける