dotbalo 3 년 전
부모
커밋
abbe145da1

+ 15 - 15
k8s-rabbitmq-cluster/rabbitmq-cluster-ss.yaml

@@ -1,5 +1,5 @@
 kind: StatefulSet
 kind: StatefulSet
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 metadata:
 metadata:
   labels:
   labels:
     app: rmq-cluster
     app: rmq-cluster
@@ -59,7 +59,7 @@ spec:
           value: rabbit@$(POD_NAME).rmq-cluster.$(POD_NAMESPACE).svc.cluster.local
           value: rabbit@$(POD_NAME).rmq-cluster.$(POD_NAMESPACE).svc.cluster.local
         - name: RABBITMQ_CONFIG_FILE
         - name: RABBITMQ_CONFIG_FILE
           value: /var/lib/rabbitmq/rabbitmq.conf
           value: /var/lib/rabbitmq/rabbitmq.conf
-        image: rabbitmq:3.7-management
+        image: registry.cn-beijing.aliyuncs.com/dotbalo/rabbitmq:3.7-management 
         imagePullPolicy: IfNotPresent
         imagePullPolicy: IfNotPresent
         livenessProbe:
         livenessProbe:
           exec:
           exec:
@@ -87,9 +87,9 @@ spec:
         - mountPath: /etc/rabbitmq
         - mountPath: /etc/rabbitmq
           name: config-volume
           name: config-volume
           readOnly: false
           readOnly: false
-        - mountPath: /var/lib/rabbitmq
-          name: rabbitmq-storage
-          readOnly: false
+#        - mountPath: /var/lib/rabbitmq
+#          name: rabbitmq-storage
+#          readOnly: false
       serviceAccountName: rmq-cluster
       serviceAccountName: rmq-cluster
       terminationGracePeriodSeconds: 30
       terminationGracePeriodSeconds: 30
       volumes:
       volumes:
@@ -101,13 +101,13 @@ spec:
             path: enabled_plugins
             path: enabled_plugins
           name: rmq-cluster-config
           name: rmq-cluster-config
         name: config-volume
         name: config-volume
-  volumeClaimTemplates:
-  - metadata:
-      name: rabbitmq-storage
-    spec:
-      accessModes:
-      - ReadWriteMany
-      storageClassName: "rmq-storage-class"
-      resources:
-        requests:
-          storage: 4Gi
+#  volumeClaimTemplates:
+#  - metadata:
+#      name: rabbitmq-storage
+#    spec:
+#      accessModes:
+#      - ReadWriteMany
+#      storageClassName: "rmq-storage-class"
+#      resources:
+#        requests:
+#          storage: 4Gi

+ 2 - 0
k8s-rabbitmq-cluster/rabbitmq-configmap.yaml

@@ -11,6 +11,8 @@ data:
     rabbitmq.conf: |
     rabbitmq.conf: |
       loopback_users.guest = false
       loopback_users.guest = false
 
 
+      default_user = RABBITMQ_USER
+      default_pass = RABBITMQ_PASS
       ## Clustering
       ## Clustering
       cluster_formation.peer_discovery_backend = rabbit_peer_discovery_k8s
       cluster_formation.peer_discovery_backend = rabbit_peer_discovery_k8s
       cluster_formation.k8s.host = kubernetes.default.svc.cluster.local
       cluster_formation.k8s.host = kubernetes.default.svc.cluster.local

+ 0 - 56
k8s-rabbitmq-cluster/rabbitmq-pv.yaml

@@ -1,56 +0,0 @@
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: pv-rmq-1
-spec:
-  capacity:
-    storage: 4Gi
-  accessModes:
-    - ReadWriteMany
-  volumeMode: Filesystem
-  persistentVolumeReclaimPolicy: Recycle
-  storageClassName: "rmq-storage-class"
-  nfs:
-    # real share directory
-    path: /k8s/rmq-cluster/rabbitmq-cluster-1
-    # nfs real ip
-    server: 192.168.2.2
-
----
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: pv-rmq-2
-spec:
-  capacity:
-    storage: 4Gi
-  accessModes:
-    - ReadWriteMany
-  volumeMode: Filesystem
-  persistentVolumeReclaimPolicy: Recycle
-  storageClassName: "rmq-storage-class"
-  nfs:
-    # real share directory
-    path: /k8s/rmq-cluster/rabbitmq-cluster-2
-    # nfs real ip
-    server: 192.168.2.2
-
----
-
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: pv-rmq-3
-spec:
-  capacity:
-    storage: 4Gi
-  accessModes:
-    - ReadWriteMany
-  volumeMode: Filesystem
-  persistentVolumeReclaimPolicy: Recycle
-  storageClassName: "rmq-storage-class"
-  nfs:
-    # real share directory
-    path: /k8s/rmq-cluster/rabbitmq-cluster-3
-    # nfs real ip
-    server: 192.168.2.2

+ 2 - 2
k8s-rabbitmq-cluster/rabbitmq-rbac.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: public-service
   namespace: public-service
 ---
 ---
 kind: Role
 kind: Role
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
 metadata:
   name: rmq-cluster
   name: rmq-cluster
   namespace: public-service
   namespace: public-service
@@ -18,7 +18,7 @@ rules:
       - get
       - get
 ---
 ---
 kind: RoleBinding
 kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
 metadata:
   name: rmq-cluster
   name: rmq-cluster
   namespace: public-service
   namespace: public-service