HDDS-1871. Remove anti-affinity rules from k8s minkube example
Signed-off-by: Anu Engineer <aengineer@apache.org>
This commit is contained in:
parent
2ae7f444bd
commit
8fc6567b94
|
@ -32,9 +32,9 @@ spec:
|
|||
app: ozone
|
||||
component: datanode
|
||||
annotations:
|
||||
prdatanodeetheus.io/scrape: "true"
|
||||
prdatanodeetheus.io/port: "9882"
|
||||
prdatanodeetheus.io/path: "/prom"
|
||||
prometheus.io/scrape: "true"
|
||||
prometheus.io/port: "9882"
|
||||
prometheus.io/path: "/prom"
|
||||
spec:
|
||||
affinity:
|
||||
podAntiAffinity:
|
||||
|
|
|
@ -33,9 +33,9 @@ spec:
|
|||
app: ozone
|
||||
component: datanode
|
||||
annotations:
|
||||
prdatanodeetheus.io/scrape: "true"
|
||||
prdatanodeetheus.io/port: "9882"
|
||||
prdatanodeetheus.io/path: /prom
|
||||
prometheus.io/scrape: "true"
|
||||
prometheus.io/port: "9882"
|
||||
prometheus.io/path: /prom
|
||||
spec:
|
||||
affinity:
|
||||
podAntiAffinity:
|
||||
|
|
|
@ -39,22 +39,6 @@ spec:
|
|||
spec:
|
||||
securityContext:
|
||||
fsGroup: 1000
|
||||
initContainers:
|
||||
- name: init
|
||||
image: '@docker.image@'
|
||||
args:
|
||||
- ozone
|
||||
- om
|
||||
- --init
|
||||
env:
|
||||
- name: WAITFOR
|
||||
value: scm-0.scm:9876
|
||||
envFrom:
|
||||
- configMapRef:
|
||||
name: config
|
||||
volumeMounts:
|
||||
- name: data
|
||||
mountPath: /data
|
||||
containers:
|
||||
- name: om
|
||||
image: '@docker.image@'
|
||||
|
@ -64,6 +48,12 @@ spec:
|
|||
env:
|
||||
- name: WAITFOR
|
||||
value: scm-0.scm:9876
|
||||
- name: ENSURE_OM_INITIALIZED
|
||||
value: /data/metadata/om/current/VERSION
|
||||
livenessProbe:
|
||||
tcpSocket:
|
||||
port: 9862
|
||||
initialDelaySeconds: 30
|
||||
envFrom:
|
||||
- configMapRef:
|
||||
name: config
|
||||
|
|
|
@ -39,6 +39,11 @@ spec:
|
|||
args:
|
||||
- ozone
|
||||
- s3g
|
||||
livenessProbe:
|
||||
httpGet:
|
||||
path: /
|
||||
port: 9878
|
||||
initialDelaySeconds: 30
|
||||
envFrom:
|
||||
- configMapRef:
|
||||
name: config
|
||||
|
|
|
@ -58,6 +58,10 @@ spec:
|
|||
args:
|
||||
- ozone
|
||||
- scm
|
||||
livenessProbe:
|
||||
tcpSocket:
|
||||
port: 9861
|
||||
initialDelaySeconds: 30
|
||||
envFrom:
|
||||
- configMapRef:
|
||||
name: config
|
||||
|
|
|
@ -22,6 +22,15 @@ import:
|
|||
image: "@docker.image@"
|
||||
- type: PublishStatefulSet
|
||||
- type: ozone/emptydir
|
||||
- type: Remove
|
||||
trigger:
|
||||
metadata:
|
||||
name: datanode
|
||||
path:
|
||||
- spec
|
||||
- template
|
||||
- spec
|
||||
- affinity
|
||||
- path: ozone/freon
|
||||
destination: freon
|
||||
transformations:
|
||||
|
|
|
@ -33,20 +33,10 @@ spec:
|
|||
app: ozone
|
||||
component: datanode
|
||||
annotations:
|
||||
prdatanodeetheus.io/scrape: "true"
|
||||
prdatanodeetheus.io/port: "9882"
|
||||
prdatanodeetheus.io/path: /prom
|
||||
prometheus.io/scrape: "true"
|
||||
prometheus.io/port: "9882"
|
||||
prometheus.io/path: /prom
|
||||
spec:
|
||||
affinity:
|
||||
podAntiAffinity:
|
||||
requiredDuringSchedulingIgnoredDuringExecution:
|
||||
- labelSelector:
|
||||
matchExpressions:
|
||||
- key: component
|
||||
operator: In
|
||||
values:
|
||||
- datanode
|
||||
topologyKey: kubernetes.io/hostname
|
||||
securityContext:
|
||||
fsGroup: 1000
|
||||
containers:
|
||||
|
@ -55,12 +45,12 @@ spec:
|
|||
args:
|
||||
- ozone
|
||||
- datanode
|
||||
volumeMounts:
|
||||
- name: data
|
||||
mountPath: /data
|
||||
envFrom:
|
||||
- configMapRef:
|
||||
name: config
|
||||
volumeMounts:
|
||||
- name: data
|
||||
mountPath: /data
|
||||
volumes:
|
||||
- name: data
|
||||
emptyDir: {}
|
||||
|
|
|
@ -54,12 +54,12 @@ spec:
|
|||
tcpSocket:
|
||||
port: 9862
|
||||
initialDelaySeconds: 30
|
||||
volumeMounts:
|
||||
- name: data
|
||||
mountPath: /data
|
||||
envFrom:
|
||||
- configMapRef:
|
||||
name: config
|
||||
volumeMounts:
|
||||
- name: data
|
||||
mountPath: /data
|
||||
volumes:
|
||||
- name: data
|
||||
emptyDir: {}
|
||||
|
|
|
@ -44,12 +44,12 @@ spec:
|
|||
path: /
|
||||
port: 9878
|
||||
initialDelaySeconds: 30
|
||||
volumeMounts:
|
||||
- name: data
|
||||
mountPath: /data
|
||||
envFrom:
|
||||
- configMapRef:
|
||||
name: config
|
||||
volumeMounts:
|
||||
- name: data
|
||||
mountPath: /data
|
||||
volumes:
|
||||
- name: data
|
||||
emptyDir: {}
|
||||
|
|
|
@ -46,12 +46,12 @@ spec:
|
|||
- ozone
|
||||
- scm
|
||||
- --init
|
||||
volumeMounts:
|
||||
- name: data
|
||||
mountPath: /data
|
||||
envFrom:
|
||||
- configMapRef:
|
||||
name: config
|
||||
volumeMounts:
|
||||
- name: data
|
||||
mountPath: /data
|
||||
containers:
|
||||
- name: scm
|
||||
image: '@docker.image@'
|
||||
|
@ -62,12 +62,12 @@ spec:
|
|||
tcpSocket:
|
||||
port: 9861
|
||||
initialDelaySeconds: 30
|
||||
volumeMounts:
|
||||
- name: data
|
||||
mountPath: /data
|
||||
envFrom:
|
||||
- configMapRef:
|
||||
name: config
|
||||
volumeMounts:
|
||||
- name: data
|
||||
mountPath: /data
|
||||
volumes:
|
||||
- name: data
|
||||
emptyDir: {}
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
kind: ClusterRole
|
||||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
metadata:
|
||||
name: csi-ozone
|
||||
name: csi-ozone-default
|
||||
rules:
|
||||
- apiGroups:
|
||||
- ""
|
||||
|
|
|
@ -17,12 +17,12 @@
|
|||
kind: ClusterRoleBinding
|
||||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
metadata:
|
||||
name: csi-ozone
|
||||
name: csi-ozone-default
|
||||
subjects:
|
||||
- kind: ServiceAccount
|
||||
name: csi-ozone
|
||||
namespace: weekly-test
|
||||
namespace: default
|
||||
roleRef:
|
||||
kind: ClusterRole
|
||||
name: csi-ozone
|
||||
name: csi-ozone-default
|
||||
apiGroup: rbac.authorization.k8s.io
|
||||
|
|
|
@ -17,5 +17,5 @@
|
|||
apiVersion: v1
|
||||
kind: ServiceAccount
|
||||
metadata:
|
||||
namespace: weekly-test
|
||||
namespace: default
|
||||
name: csi-ozone
|
||||
|
|
|
@ -33,9 +33,9 @@ spec:
|
|||
app: ozone
|
||||
component: datanode
|
||||
annotations:
|
||||
prdatanodeetheus.io/scrape: "true"
|
||||
prdatanodeetheus.io/port: "9882"
|
||||
prdatanodeetheus.io/path: /prom
|
||||
prometheus.io/scrape: "true"
|
||||
prometheus.io/port: "9882"
|
||||
prometheus.io/path: /prom
|
||||
spec:
|
||||
affinity:
|
||||
podAntiAffinity:
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
apiVersion: rbac.authorization.k8s.io/v1beta1
|
||||
kind: ClusterRole
|
||||
metadata:
|
||||
name: prometheus
|
||||
name: prometheus-default
|
||||
rules:
|
||||
- apiGroups:
|
||||
- ""
|
||||
|
|
|
@ -17,12 +17,12 @@
|
|||
apiVersion: rbac.authorization.k8s.io/v1beta1
|
||||
kind: ClusterRoleBinding
|
||||
metadata:
|
||||
name: prometheus-operator
|
||||
name: prometheus-operator-default
|
||||
roleRef:
|
||||
apiGroup: rbac.authorization.k8s.io
|
||||
kind: ClusterRole
|
||||
name: prometheus
|
||||
name: prometheus-default
|
||||
subjects:
|
||||
- kind: ServiceAccount
|
||||
name: prometheus-operator
|
||||
namespace: weekly-test
|
||||
namespace: default
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
kind: ClusterRole
|
||||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
metadata:
|
||||
name: csi-ozone
|
||||
name: csi-ozone-default
|
||||
rules:
|
||||
- apiGroups:
|
||||
- ""
|
||||
|
|
|
@ -17,12 +17,12 @@
|
|||
kind: ClusterRoleBinding
|
||||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
metadata:
|
||||
name: csi-ozone
|
||||
name: csi-ozone-default
|
||||
subjects:
|
||||
- kind: ServiceAccount
|
||||
name: csi-ozone
|
||||
namespace: weekly-test
|
||||
namespace: default
|
||||
roleRef:
|
||||
kind: ClusterRole
|
||||
name: csi-ozone
|
||||
name: csi-ozone-default
|
||||
apiGroup: rbac.authorization.k8s.io
|
||||
|
|
|
@ -17,5 +17,5 @@
|
|||
apiVersion: v1
|
||||
kind: ServiceAccount
|
||||
metadata:
|
||||
namespace: weekly-test
|
||||
namespace: default
|
||||
name: csi-ozone
|
||||
|
|
|
@ -33,9 +33,9 @@ spec:
|
|||
app: ozone
|
||||
component: datanode
|
||||
annotations:
|
||||
prdatanodeetheus.io/scrape: "true"
|
||||
prdatanodeetheus.io/port: "9882"
|
||||
prdatanodeetheus.io/path: /prom
|
||||
prometheus.io/scrape: "true"
|
||||
prometheus.io/port: "9882"
|
||||
prometheus.io/path: /prom
|
||||
spec:
|
||||
affinity:
|
||||
podAntiAffinity:
|
||||
|
|
Loading…
Reference in New Issue