Commit b09fc281 authored by Pantelis Malekas's avatar Pantelis Malekas
Browse files

Merge branch 'develop' into new-keycloak

parents 0eda8ae9 613fc924

charts/hypo/templates/_helpers.tpl

+0 −18
Changes for charts/hypo/templates/_helpers.tpl: 0 added lines, 18 removed lines.
Original line number Diff line number Diff line
@@ -129,14 +129,6 @@ Create Service Monitor name and version as used by the chart label. 
{{- printf "%s-%s" (include "hypo.fullname" .) $serviceMonitor.name | trunc 63 | trimSuffix "-" -}}

{{- end -}}





{{/*

Create Infinispan name and version as used by the chart label.

*/}}

{{- define "hypo.infinispan.fullname" -}}

{{- printf "%s-%s" (include "hypo.fullname" .) .Values.infinispan.name | trunc 63 | trimSuffix "-" -}}

{{- end -}}



{{/*

Create Registry Server name and version as used by the chart label.

*/}}
@@ -224,16 +216,6 @@ Create connection string for Sonata. 
{{- end -}}

{{- end -}}





{{/*

Create connection string for Infinispan.

*/}} 

{{- define "hypo.infinispan.url" -}}

{{- if .Values.infinispan.enabled -}}

{{- printf "%s-%s.%s.svc.cluster.local" (include "hypo.fullname" .) .Values.infinispan.name .Release.Namespace -}}

{{- end -}}

{{- end -}}



{{/*

Create connection string for Registry Server.

*/}}

charts/hypo/templates/sonata/deployment-infinispan.yaml

deleted100644 → 0
+0 −60
Changes for charts/hypo/templates/sonata/deployment-infinispan.yaml: 0 added lines, 60 removed lines.
Original line number Diff line number Diff line 
{{- if .Values.infinispan.enabled -}}

apiVersion: apps/v1

kind: Deployment

metadata:

  name: {{ template "hypo.infinispan.fullname" . }}

  namespace: {{ .Release.Namespace  }}

  labels:

{{ include "hypo.labels" . | nindent 4 }}

    app: {{ template "hypo.infinispan.fullname" . }}

spec:

  replicas: {{ .Values.infinispan.replicaCount }}

  selector:

    matchLabels:

{{ include "hypo.selectorLabels" . | nindent 6 }}

      app: {{ template "hypo.infinispan.fullname" . }}

  template:

    metadata:

      {{- with .Values.infinispan.podAnnotations }}

      annotations:

        {{- toYaml . | nindent 8 }}

      {{- end }}

      labels:

        app: {{ template "hypo.infinispan.fullname" . }}

        {{- include "hypo.labels" . | nindent 8 }}

	{{- with .Values.infinispan.podLabels }}

        {{- toYaml . | nindent 8 }}

        {{- end }}

    spec:

      containers:

        - name: {{ .Values.infinispan.name }}

          image: "{{ .Values.infinispan.image.repository }}:{{ .Values.infinispan.image.tag }}"

          imagePullPolicy: {{ .Values.infinispan.image.pullPolicy }}

          ports:

            - name: http

              containerPort: {{ .Values.infinispan.containerPort }}

              protocol: TCP

          #livenessProbe:

          #  httpGet:

          #    path: /

          #    port: http

          #readinessProbe:

          #  httpGet:

          #    path: /

          #    port: http

          env:

            - name: USER

              value: {{ .Values.infinispan.env.user }}

            - name: PASS

              value: {{ .Values.infinispan.env.pass }}

          resources:

            {{- toYaml .Values.infinispan.resources | nindent 12 }}

          {{- with .Values.infinispan.volumeMounts }}

          volumeMounts:

            {{- toYaml . | nindent 12 }}

          {{- end }}

      {{- with .Values.infinispan.volumes }}

      volumes:

        {{- toYaml . | nindent 8 }}

      {{- end }}

{{- end -}}

charts/hypo/templates/sonata/deployment.yaml

+4 −16
Changes for charts/hypo/templates/sonata/deployment.yaml: 4 added lines, 16 removed lines.
Original line number Diff line number Diff line
@@ -34,10 +34,6 @@ spec: 
          image: busybox:latest

          imagePullPolicy: IfNotPresent

          args: [ 'sh', '-c', 'until nc -z -w 1 {{ template "hypo.kafka.url" . }} {{ .Values.kafka.service.ports.client }}; do echo "Sleeping for Kafka"; sleep 1; done; echo "ready!";' ]

        - name: wait-for-infinispan

          image: busybox:latest

          imagePullPolicy: IfNotPresent

          args: [ 'sh', '-c', 'until nc -z -w 1 {{ template "hypo.infinispan.url" . }} {{ .Values.infinispan.service.port }}; do echo "Sleeping for Infinispan"; sleep 1; done; echo "ready!";' ]

      {{- with .Values.sonata.imagePullSecrets }}

      imagePullSecrets:

        {{- toYaml . | nindent 8 }}
@@ -71,18 +67,6 @@ spec: 
              value: http://{{ template "hypo.otel.url" . }}:{{ include "hypo.otel.port" . }}

            - name: _PROD_QUARKUS_REST_CLIENT_SONATA_API_URL

              value: http://{{ template "hypo.sonata.url" . }}:{{ .Values.sonata.service.port }}/sonata/

            - name: _PROD_QUARKUS_INFINISPAN_CLIENT_HOSTS

              value: {{ template "hypo.infinispan.url" . }}:{{ .Values.infinispan.service.port }}

            - name: _PROD_QUARKUS_INFINISPAN_CLIENT_AUTH_SERVER_NAME

              value: {{ .Values.infinispan.env.authServer }}

            - name: _PROD_QUARKUS_INFINISPAN_CLIENT_USERNAME

              value: {{ .Values.infinispan.env.user }}

            - name: _PROD_QUARKUS_INFINISPAN_CLIENT_PASSWORD

              value: {{ .Values.infinispan.env.pass }}

            - name: _PROD_QUARKUS_INFINISPAN_CLIENT_AUTH_REALM

              value: {{ .Values.infinispan.env.authRealm }}

            - name: _PROD_QUARKUS_INFINISPAN_CLIENT_CLIENT_INTELLIGENCE

              value: {{ .Values.infinispan.env.clientIntelligence }}

            - name: SONATA_VAULT_TOKEN_PATH

              value: {{ .Values.sonata.env.SONATA_VAULT_TOKEN_PATH }}

            - name: _PROD_QUARKUS_DATASOURCE_JDBC_URL
@@ -93,6 +77,10 @@ spec: 
              value: {{ $postgresqlDb.auth.username }}

            - name: _PROD_QUARKUS_DATASOURCE_PASSWORD

              value: {{ $postgresqlDb.auth.password }}

            - name: _PROD_QUARKUS_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT

              value: http://{{ template "hypo.otel.url" . }}:{{ include "hypo.otel.port" . }}

            - name: _PROD_QUARKUS_OTEL_EXPORTER_OTLP_METRICS_ENDPOINT

              value: http://{{ template "hypo.otel.url" . }}:{{ include "hypo.otel.port" . }}

            #- name: _PROD_QUARKUS_OTEL_EXPORTER_OTLP_TRACES_TIMEOUT

            #  value: 30S

          resources:

charts/hypo/templates/sonata/service-infinispan.yaml

deleted100644 → 0
+0 −22
Changes for charts/hypo/templates/sonata/service-infinispan.yaml: 0 added lines, 22 removed lines.
Original line number Diff line number Diff line 
{{- if .Values.infinispan.enabled -}}

apiVersion: v1

kind: Service

metadata:

  name: {{ template "hypo.infinispan.fullname" . }}

  labels:

{{ include "hypo.labels" . | nindent 4 }}

    app: {{ template "hypo.infinispan.fullname" . }}

spec:

  type: {{ .Values.infinispan.service.type }}

  ports:

    - port: {{ .Values.infinispan.service.port }}

      targetPort: http

      protocol: TCP

      name: http

      {{- if eq .Values.infinispan.service.type "NodePort" }}

      nodePort: {{ .Values.infinispan.service.nodePort }}

      {{- end }}

  selector:

{{ include "hypo.labels" . | nindent 4 }}

    app: {{ template "hypo.infinispan.fullname" . }}

{{- end -}}

charts/hypo/values.yaml

+0 −30
Changes for charts/hypo/values.yaml: 0 added lines, 30 removed lines.
Original line number Diff line number Diff line
@@ -577,36 +577,6 @@ service-monitor: 


  tolerations: []





infinispan:

  enabled: true



  name: infinispan



  replicaCount: 1



  image:

    repository: infinispan/server

    pullPolicy: IfNotPresent

    tag: "14.0.24.Final"



  nameOverride: ""

  fullnameOverride: ""



  containerPort: 11222



  service:

    type: NodePort

    port: 11222

    nodePort: 31222



  env:

    user: infinispan

    pass: infinispan

    authServer: infinispan

    authRealm: default

    clientIntelligence: BASIC



registry-server:

  enabled: true