Bladeren bron

dsfsadfasdfsdfasdf

yangxg 4 jaren geleden
bovenliggende
commit
732b2c9ff8
3 gewijzigde bestanden met toevoegingen van 61 en 196 verwijderingen
  1. 9 0
      deploy-tmp-kafka.yaml
  2. 52 58
      deploy-tmp-zookeeper.yaml
  3. 0 138
      deploy-tmp-zookeeper2.yaml

+ 9 - 0
deploy-tmp-kafka.yaml

@@ -92,11 +92,20 @@ spec:
             - name: volume
               mountPath: /data/kafka
           readinessProbe:
+            tcpSocket:
+              port: 9093
+            timeoutSeconds: 5
+            periodSeconds: 5
+            initialDelaySeconds: 45
+          livenessProbe:
             exec:
               command:
                 - sh
                 - -c
                 - "/opt/kafka/bin/kafka-broker-api-versions.sh --bootstrap-server=localhost:9093"
+            timeoutSeconds: 5
+            periodSeconds: 5
+            initialDelaySeconds: 60
       securityContext:
         runAsUser: 1000
         fsGroup: 1000

+ 52 - 58
deploy-tmp-zookeeper.yaml

@@ -1,14 +1,55 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: zk-hs
+  namespace: qa
+  labels:
+    app: zk
+spec:
+  ports:
+    - port: 2888
+      name: server
+    - port: 3888
+      name: leader-election
+  clusterIP: None
+  selector:
+    app: zk
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: zk-cs
+  namespace: qa
+  labels:
+    app: zk
+spec:
+  ports:
+    - port: 2181
+      name: client
+  selector:
+    app: zk
+---
+apiVersion: policy/v1beta1
+kind: PodDisruptionBudget
+metadata:
+  name: zk-pdb
+  namespace: qa
+spec:
+  selector:
+    matchLabels:
+      app: zk
+  maxUnavailable: 1
 ---
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: zookeeper
+  name: zk
   namespace: qa
 spec:
   selector:
     matchLabels:
-      app: zookeeper
-  serviceName: zookeeper-hs
+      app: zk
+  serviceName: zk-hs
   replicas: 3
   updateStrategy:
     type: RollingUpdate
@@ -16,9 +57,8 @@ spec:
   template:
     metadata:
       labels:
-        app: zookeeper
+        app: zk
     spec:
-      terminationGracePeriodSeconds: 180
       affinity:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
@@ -27,7 +67,7 @@ spec:
                   - key: "app"
                     operator: In
                     values:
-                      - zookeeper
+                      - zk
               topologyKey: "kubernetes.io/hostname"
       containers:
         - name: kubernetes-zookeeper
@@ -49,8 +89,8 @@ spec:
             - -c
             - "start-zookeeper \
           --servers=3 \
-          --data_dir=/data/zookeeper \
-          --data_log_dir=/data/zookeeper/log \
+          --data_dir=/var/lib/zookeeper/data \
+          --data_log_dir=/var/lib/zookeeper/data/log \
           --conf_dir=/opt/zookeeper/conf \
           --client_port=2181 \
           --election_port=3888 \
@@ -82,63 +122,17 @@ spec:
             initialDelaySeconds: 10
             timeoutSeconds: 5
           volumeMounts:
-            - name: volume
-              mountPath: /data/zookeeper
+            - name: datadir
+              mountPath: /var/lib/zookeeper
       securityContext:
         runAsUser: 1000
         fsGroup: 1000
   volumeClaimTemplates:
     - metadata:
-        name: volume
-        annotations:
-          volume.alpha.kubernetes.io/storage-class: anything
+        name: datadir
       spec:
         accessModes: [ "ReadWriteOnce" ]
         storageClassName: rbd
         resources:
           requests:
-            storage: 5Gi
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: zookeeper-hs
-  namespace: qa
-  labels:
-    app: zookeeper
-spec:
-  ports:
-    - port: 2888
-      name: server
-    - port: 3888
-      name: leader-election
-  clusterIP: None
-  selector:
-    app: zookeeper
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: zookeeper-cs
-  namespace: qa
-  labels:
-    app: zookeeper
-spec:
-  type: NodePort
-  ports:
-    - port: 2181
-      name: client
-      nodePort: 31812
-  selector:
-    app: zookeeper
----
-apiVersion: policy/v1beta1
-kind: PodDisruptionBudget
-metadata:
-  name: zookeeper-pdb
-  namespace: qa
-spec:
-  selector:
-    matchLabels:
-      app: zookeeper
-  maxUnavailable: 1
+            storage: 10Gi

+ 0 - 138
deploy-tmp-zookeeper2.yaml

@@ -1,138 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: zk-hs
-  namespace: qa
-  labels:
-    app: zk
-spec:
-  ports:
-    - port: 2888
-      name: server
-    - port: 3888
-      name: leader-election
-  clusterIP: None
-  selector:
-    app: zk
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: zk-cs
-  namespace: qa
-  labels:
-    app: zk
-spec:
-  ports:
-    - port: 2181
-      name: client
-  selector:
-    app: zk
----
-apiVersion: policy/v1beta1
-kind: PodDisruptionBudget
-metadata:
-  name: zk-pdb
-  namespace: qa
-spec:
-  selector:
-    matchLabels:
-      app: zk
-  maxUnavailable: 1
----
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: zk
-  namespace: qa
-spec:
-  selector:
-    matchLabels:
-      app: zk
-  serviceName: zk-hs
-  replicas: 3
-  updateStrategy:
-    type: RollingUpdate
-  podManagementPolicy: OrderedReady
-  template:
-    metadata:
-      labels:
-        app: zk
-    spec:
-      affinity:
-        podAntiAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            - labelSelector:
-                matchExpressions:
-                  - key: "app"
-                    operator: In
-                    values:
-                      - zk
-              topologyKey: "kubernetes.io/hostname"
-      containers:
-        - name: kubernetes-zookeeper
-          imagePullPolicy: Always
-          image: "leolee32/kubernetes-library:kubernetes-zookeeper1.0-3.4.10"
-          resources:
-            requests:
-              memory: "1Gi"
-              cpu: "0.5"
-          ports:
-            - containerPort: 2181
-              name: client
-            - containerPort: 2888
-              name: server
-            - containerPort: 3888
-              name: leader-election
-          command:
-            - sh
-            - -c
-            - "start-zookeeper \
-          --servers=3 \
-          --data_dir=/var/lib/zookeeper/data \
-          --data_log_dir=/var/lib/zookeeper/data/log \
-          --conf_dir=/opt/zookeeper/conf \
-          --client_port=2181 \
-          --election_port=3888 \
-          --server_port=2888 \
-          --tick_time=2000 \
-          --init_limit=10 \
-          --sync_limit=5 \
-          --heap=512M \
-          --max_client_cnxns=60 \
-          --snap_retain_count=3 \
-          --purge_interval=12 \
-          --max_session_timeout=40000 \
-          --min_session_timeout=4000 \
-          --log_level=INFO"
-          readinessProbe:
-            exec:
-              command:
-                - sh
-                - -c
-                - "zookeeper-ready 2181"
-            initialDelaySeconds: 10
-            timeoutSeconds: 5
-          livenessProbe:
-            exec:
-              command:
-                - sh
-                - -c
-                - "zookeeper-ready 2181"
-            initialDelaySeconds: 10
-            timeoutSeconds: 5
-          volumeMounts:
-            - name: datadir
-              mountPath: /var/lib/zookeeper
-      securityContext:
-        runAsUser: 1000
-        fsGroup: 1000
-  volumeClaimTemplates:
-    - metadata:
-        name: datadir
-      spec:
-        accessModes: [ "ReadWriteOnce" ]
-        storageClassName: rbd
-        resources:
-          requests:
-            storage: 10Gi