diff --git a/microservicesruntime/helm/README.md b/microservicesruntime/helm/README.md index b22baf2..469d6e3 100644 --- a/microservicesruntime/helm/README.md +++ b/microservicesruntime/helm/README.md @@ -173,7 +173,6 @@ helm install wm-msr webmethods/microservicesruntime \ | serviceAccount.annotations | object | `{}` | Annotations to add to the service account | | serviceAccount.create | bool | `true` | Specifies whether a service account should be created | | serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template | -| serviceMonitor | bool | `false` | deploy service monitor for Prometheus, by default disabled as we use pod annotations for Prometheus | | startupProbe | object | `{"failureThreshold":60,"periodSeconds":30,"tcpSocket":{"port":"http"}}` | startup probe for container | | statefulSet | bool | `false` | StatefulSet or Deployment. You should only change this if you require Client Side queuing (CSQ) or functionality in IS which requires stable hostnames and filesystems. Default is false => Deployment. Keep in mind, you must disable CSQ on each webMethods messaging and JMS connection if you don't use stateful-sets. See examples in Process Engine deployment for disableing QSC. | | tolerations | list | `[]` | | diff --git a/microservicesruntime/helm/templates/servicemonitor.yaml b/microservicesruntime/helm/templates/servicemonitor.yaml deleted file mode 100644 index 3c4fd84..0000000 --- a/microservicesruntime/helm/templates/servicemonitor.yaml +++ /dev/null @@ -1,42 +0,0 @@ -# /* -# * Copyright (c) 2023 Software AG, Darmstadt, Germany and/or its licensors -# * -# * SPDX-License-Identifier: Apache-2.0 -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# * -# */ -{{- if .Values.serviceMonitor -}} -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: {{ include "common.names.fullname" . }} - namespace: {{ .Release.Namespace }} - labels: - {{- include "common.labels.standard" . | nindent 4 }} - {{- with .Values.extraLabels -}} - {{ toYaml . | nindent 4 }} - {{- end }} -spec: - endpoints: - - targetPort: {{ .Values.microservicesruntime.adminPort }} - scheme: {{ .Values.microservicesruntime.adminPortScheme }} - tlsConfig: - insecureSkipVerify: true - namespaceSelector: - matchNames: - - {{ .Release.Namespace }} - selector: - matchLabels: - app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} \ No newline at end of file diff --git a/microservicesruntime/helm/values.yaml b/microservicesruntime/helm/values.yaml index fc7c5df..5f3fe90 100644 --- a/microservicesruntime/helm/values.yaml +++ b/microservicesruntime/helm/values.yaml @@ -6,9 +6,6 @@ replicaCount: 1 # -- StatefulSet or Deployment. You should only change this if you require Client Side queuing (CSQ) or functionality in IS which requires stable hostnames and filesystems. Default is false => Deployment. Keep in mind, you must disable CSQ on each webMethods messaging and JMS connection if you don't use stateful-sets. See examples in Process Engine deployment for disableing QSC. statefulSet: false -# -- deploy service monitor for Prometheus, by default disabled as we use pod annotations for Prometheus -serviceMonitor: false - image: # -- Pull this image. Default is MSR from [Software AG Container Registry](https://containers.softwareag.com) repository: "sagcr.azurecr.io/webmethods-microservicesruntime"