wip: reworking manifests

rabbitmq/applicationset.yaml

@@ -1,49 +1,34 @@
 apiVersion: argoproj.io/v1alpha1
-kind: Application
+kind: ApplicationSet
 metadata:
   name: rabbitmq
   namespace: argocd
+spec:
+  generators:
+  - list:
+      elements:
+      - cluster: https://kubernetes.default.svc
+        env: prod
+        hostname: rabbitmq.srv.oceanbox.io
+      - cluster: https://kubernetes.default.svc
+        env: staging
+        hostname: rabbitmq.beta.oceanbox.io
+  template:
+    metadata:
+      name: '{{ env }}-rabbitmq'
 spec:
   project: atlantis
   destination:
     server: https://kubernetes.default.svc
-    namespace: atlantis
+    namespace: rabbitmq
   sources:
     - repoURL: https://charts.bitnami.com/bitnami
       targetRevision: 12.9.0
       chart: rabbitmq
       helm:
-        values: |
-          auth:
-            erlangCookie: ""
-            existingErlangSecret: ""
-            existingPasswordSecret: ""
-            password: hunny-bunny
-            username: user
-          clusterDomain: cluster.local
-          ingress:
-            annotations:
-              cert-manager.io/cluster-issuer: letsencrypt-production
-              nginx.ingress.kubernetes.io/ssl-redirect: "true"
-              nginx.ingress.kubernetes.io/whitelist-source-range: 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
-            enabled: true
-            extraHosts: []
-            extraPaths: []
-            extraRules: []
-            hostname: rabbitmq.svc.oceanbox.io
-            ingressClassName: ""
-            path: /
-            pathType: ImplementationSpecific
-            secrets: []
-            selfSigned: false
-            tls: true
-          persistence:
-            accessModes:
-            - ReadWriteOnce
-            enabled: true
-            existingClaim: ""
-            size: 8Gi
-            storageClass: ""
-    - repoURL: https://gitlab.com/oceanbox/manifests
+        valuesFiles:
+          - $values/rabbitmq/{{ env }}/-values.yaml
+    - repoURL: https://gitlab.com/oceanbox/manifests.git
       targetRevision: HEAD
-      path: rabbitmq/manifests
+      path: rabbitmq/{{ env }}
+      ref: values

rabbitmq/prod/nodeport.yaml

@@ -1,14 +1,9 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: rabbitmq-nodeport
-  namespace: atlantis
+  name: prod-rabbitmq-nodeport
+  namespace: rabbitmq
 spec:
-  externalTrafficPolicy: Cluster
-  internalTrafficPolicy: Cluster
-  ipFamilies:
-  - IPv4
-  ipFamilyPolicy: SingleStack
   ports:
   - name: amqp
     nodePort: 30672
@@ -21,8 +16,7 @@ spec:
     protocol: TCP
     targetPort: 15672
   selector:
-    app.kubernetes.io/instance: rabbitmq
-    app.kubernetes.io/name: rabbitmq
-  sessionAffinity: None
+    app.kubernetes.io/instance: prod-rabbitmq
+    app.kubernetes.io/name: prod-rabbitmq
   type: NodePort
 

rabbitmq/prod/values.yaml

@@ -0,0 +1,31 @@
+auth:
+  erlangCookie: ""
+  existingErlangSecret: ""
+  existingPasswordSecret: ""
+  password: hunny-bunny
+  username: user
+clusterDomain: cluster.local
+ingress:
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt-production
+    nginx.ingress.kubernetes.io/ssl-redirect: "true"
+    nginx.ingress.kubernetes.io/whitelist-source-range: 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
+  enabled: true
+  extraHosts: []
+  extraPaths: []
+  extraRules: []
+  hostname: rabbitmq.srv.oceanbox.io
+  ingressClassName: ""
+  path: /
+  pathType: ImplementationSpecific
+  secrets: []
+  selfSigned: false
+  tls: true
+persistence:
+  accessModes:
+  - ReadWriteOnce
+  enabled: true
+  existingClaim: ""
+  size: 8Gi
+  storageClass: ""
+

rabbitmq/staging/nodeport.yaml

@@ -0,0 +1,22 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: staging-rabbitmq-nodeport
+  namespace: rabbitmq
+spec:
+  ports:
+  - name: amqp
+    nodePort: 31672
+    port: 5672
+    protocol: TCP
+    targetPort: 5672
+  - name: amqp-http
+    nodePort: 31673
+    port: 15672
+    protocol: TCP
+    targetPort: 15672
+  selector:
+    app.kubernetes.io/instance: staging-rabbitmq
+    app.kubernetes.io/name: staging-rabbitmq
+  type: NodePort
+

rabbitmq/staging/values.yaml

@@ -0,0 +1,31 @@
+auth:
+  erlangCookie: ""
+  existingErlangSecret: ""
+  existingPasswordSecret: ""
+  password: hunny-bunny
+  username: user
+clusterDomain: cluster.local
+ingress:
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt-staging
+    nginx.ingress.kubernetes.io/ssl-redirect: "true"
+    nginx.ingress.kubernetes.io/whitelist-source-range: 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
+  enabled: true
+  extraHosts: []
+  extraPaths: []
+  extraRules: []
+  hostname: rabbitmq.beta.oceanbox.io
+  ingressClassName: ""
+  path: /
+  pathType: ImplementationSpecific
+  secrets: []
+  selfSigned: false
+  tls: true
+persistence:
+  accessModes:
+  - ReadWriteOnce
+  enabled: true
+  existingClaim: ""
+  size: 8Gi
+  storageClass: ""
+