Merge pull request #132 from couchbase-partners/K8S-3522

K8s-3522 Removed prometheus exporter from sync gateway
couchbase-partners · Jul 11, 2024 · e9dc8c4 · e9dc8c4
2 parents fb58c5b + eff7792
commit e9dc8c4
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 86 deletions.
diff --git a/charts/couchbase-operator/Chart.yaml b/charts/couchbase-operator/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: couchbase-operator
 description: A Helm chart to deploy the Couchbase Autonomous Operator for easily deploying, managing, and maintaining Couchbase Clusters. Couchbase Server is a NoSQL document database with a distributed architecture for performance, scalability, and availability. It enables developers to build applications easier and faster by leveraging the power of SQL with the flexibility of JSON.
-version: 2.64.0
+version: 2.64.1
 appVersion: 2.6.4
 type: application
 keywords:

diff --git a/charts/couchbase-operator/README.md b/charts/couchbase-operator/README.md
@@ -291,9 +291,6 @@ for more information about customizing and managing your charts.
 | syncGateway.imagePullPolicy | string | `"IfNotPresent"` |  |
 | syncGateway.kind | string | `"Deployment"` | Kind of resource to use when installing sync gateway resource. suppports (Deployment | Statefulset) |
 | syncGateway.labels | object | `{}` | Labels to apply to the deployment resource |
-| syncGateway.monitoring.prometheus.enabled | bool | `false` | Defines whether Prometheus metric collection is enabled |
-| syncGateway.monitoring.prometheus.image | object | `{"repository":"couchbasesamples/sync-gateway-prometheus-exporter","tag":"latest"}` | Image used by the Sync Gateway to perform metric collection (injected as a "sidecar" in each Sync Gateway Pod) |
-| syncGateway.monitoring.prometheus.resources | object | `{}` |  |
 | syncGateway.name | string | `nil` | Name of the sync gateway pod. defaults to name of chart |
 | syncGateway.nodeSelector | object | `{}` | Which nodes to run the pods on |
 | syncGateway.podLabels | object | `{}` | Labels to apply to the pods |

diff --git a/charts/couchbase-operator/README.md.adoc b/charts/couchbase-operator/README.md.adoc
@@ -270,9 +270,6 @@
 | syncGateway.imagePullPolicy | string | `"IfNotPresent"` |  
 | syncGateway.kind | string | `"Deployment"` | Kind of resource to use when installing sync gateway resource. suppports (Deployment | Statefulset) 
 | syncGateway.labels | object | `{}` | Labels to apply to the deployment resource 
-| syncGateway.monitoring.prometheus.enabled | bool | `false` | Defines whether Prometheus metric collection is enabled 
-| syncGateway.monitoring.prometheus.image | object | `{"repository":"couchbasesamples/sync-gateway-prometheus-exporter","tag":"latest"}` | Image used by the Sync Gateway to perform metric collection (injected as a "sidecar" in each Sync Gateway Pod) 
-| syncGateway.monitoring.prometheus.resources | object | `{}` |  
 | syncGateway.name | string | `nil` | Name of the sync gateway pod. defaults to name of chart 
 | syncGateway.nodeSelector | object | `{}` | Which nodes to run the pods on 
 | syncGateway.podLabels | object | `{}` | Labels to apply to the pods 

diff --git a/charts/couchbase-operator/templates/sync-gateway-deployment.yaml b/charts/couchbase-operator/templates/sync-gateway-deployment.yaml
@@ -66,16 +66,6 @@ spec:
           {{- end }}
         resources:          
 {{ toYaml .Values.syncGateway.resources | indent 10 }}
-      {{- if .Values.syncGateway.monitoring.prometheus.enabled }}
-      - name: exporter
-        image: {{ (printf "%s:%s" .Values.syncGateway.monitoring.prometheus.image.repository .Values.syncGateway.monitoring.prometheus.image.tag) | quote }}
-        args: ["--log.level={{ default "info" .Values.syncGateway.monitoring.prometheus.logLevel }}"]
-        ports:
-        - name: http
-          containerPort: 9421
-        resources:
-{{ toYaml .Values.syncGateway.monitoring.prometheus.resources | indent 10 }}          
-      {{- end }}
       volumes:
       - name: config
         secret:
@@ -191,27 +181,6 @@ spec:
   sessionAffinity: None
   type: LoadBalancer
 {{- end -}}
-{{- if .Values.syncGateway.monitoring.prometheus.enabled }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: sync-gateway-exporter
-  labels:
-    app.kubernetes.io/name: {{ include "couchbase-cluster.sg.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    helm.sh/chart: {{ include "couchbase-cluster.chart" . }}   
-spec:
-  ports:
-    - port: 9421
-      protocol: TCP
-      targetPort: http
-      name: http
-  selector:
-    app.kubernetes.io/name: {{ include "couchbase-cluster.sg.name" . }}
-  type: ClusterIP
-{{- end -}}  
 {{- if not .Values.syncGateway.configSecret }}
 {{ $syncGatewayConfig := deepCopy .Values.syncGateway.config }}
 ---

diff --git a/charts/couchbase-operator/values-all.yaml b/charts/couchbase-operator/values-all.yaml
@@ -518,22 +518,6 @@ syncGateway:
     annotations: {}
     # -- Optionally configure traffic policy for LoadBalancer and NodePort
     externalTrafficPolicy:
-  # defines integration with third party monitoring software
-  monitoring:
-    prometheus:
-      # -- Defines whether Prometheus metric collection is enabled
-      enabled: false
-      # -- Image used by the Sync Gateway to perform metric collection
-      # (injected as a "sidecar" in each Sync Gateway Pod)
-      image:
-        repository: couchbasesamples/sync-gateway-prometheus-exporter
-        tag: latest
-      # pod
-      resources: {}
-        # requests:
-        #   cpu: 100m
-        # limits:
-        #   cpu: 100m
   # -- Database config
   config:
     logging:

diff --git a/charts/couchbase-operator/values.yaml b/charts/couchbase-operator/values.yaml
@@ -518,22 +518,6 @@ syncGateway:
     annotations: {}
     # -- Optionally configure traffic policy for LoadBalancer and NodePort
     externalTrafficPolicy:
-  # defines integration with third party monitoring software
-  monitoring:
-    prometheus:
-      # -- Defines whether Prometheus metric collection is enabled
-      enabled: false
-      # -- Image used by the Sync Gateway to perform metric collection
-      # (injected as a "sidecar" in each Sync Gateway Pod)
-      image:
-        repository: couchbasesamples/sync-gateway-prometheus-exporter
-        tag: latest
-      # pod
-      resources: {}
-        # requests:
-        #   cpu: 100m
-        # limits:
-        #   cpu: 100m
   # -- Database config
   config:
     logging:

diff --git a/charts/couchbase-operator/values.yamltmpl b/charts/couchbase-operator/values.yamltmpl
@@ -518,22 +518,6 @@ syncGateway:
     annotations: {}
     # -- Optionally configure traffic policy for LoadBalancer and NodePort
     externalTrafficPolicy:
-  # defines integration with third party monitoring software
-  monitoring:
-    prometheus:
-      # -- Defines whether Prometheus metric collection is enabled
-      enabled: false
-      # -- Image used by the Sync Gateway to perform metric collection
-      # (injected as a "sidecar" in each Sync Gateway Pod)
-      image:
-        repository: couchbasesamples/sync-gateway-prometheus-exporter
-        tag: latest
-      # pod
-      resources: {}
-        # requests:
-        #   cpu: 100m
-        # limits:
-        #   cpu: 100m
   # -- Database config
   config:
     logging: