Merge branch 'merge-ibm-helm' into 'master'

Merge ibm helm

See merge request !403

.gitlab-ci.yml

@@ -20,6 +20,10 @@ variables:
 
   IBM_BUILD_SUBDIR: provider/indexer-ibm
   IBM_INT_TEST_SUBDIR: testing/indexer-test-ibm
+  
+  IBM_HELM_CONFIG_PATH: devops/ibm/ibm-indexer-config
+  IBM_HELM_DEPLOY_PATH: devops/ibm/ibm-indexer-deploy
+
 
   AZURE_SERVICE: indexer
   AZURE_BUILD_SUBDIR: provider/indexer-azure

devops/ibm/ibm-indexer-config/.helmignore

+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

devops/ibm/ibm-indexer-config/Chart.yaml

+apiVersion: v2
+name: ibm-indexer-config
+description: A Helm chart for Kubernetes
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.1.0
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+# It is recommended to use it with quotes.
+appVersion: "1.16.0"

devops/ibm/ibm-indexer-config/templates/_helpers.tpl

+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "ibm-indexer-config.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "ibm-indexer-config.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "ibm-indexer-config.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "ibm-indexer-config.labels" -}}
+helm.sh/chart: {{ include "ibm-indexer-config.chart" . }}
+{{ include "ibm-indexer-config.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "ibm-indexer-config.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "ibm-indexer-config.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "ibm-indexer-config.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "ibm-indexer-config.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}

devops/ibm/ibm-indexer-config/templates/configmap.yaml

+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "{{ .Values.conf.configmap }}"
+data:
+#log-and-common
+  LOG_LEVEL: "{{ .Values.data.logLevel }}"
+  LOG_PREFIX: "{{ .Values.data.logPrefix }}"
+  logging.level.org.opengroup.osdu: "{{ .Values.data.loggingLevelOsdu }}"
+  logging.level.org.springframework.web: "{{ .Values.data.loggingLevelSpring }}"
+  JAVA_APP_JAR: "{{ .Values.data.javaAppJar }}"
+  server.servlet.context-path: "{{ .Values.data.contextPath }}"
+  server.port: "{{ .Values.data.serverPort }}"
+  ibm.env.prefix:  "{{ .Values.data.envPrefix }}"
+  ibm.env.prefix_project:  "{{ .Values.data.envPrefixProject }}"
+  spring.main.allow-bean-definition-overriding: "{{ .Values.data.beanDefOverriding }}"
+  cache.expiration: "{{ .Values.data.cacheExpiration }}"
+  cache.maxSize: "{{ .Values.data.cahceMaxSize }}"
+  ibm.health-check-uri: "{{ .Values.data.healthCheckUri }}"
+  
+# Indexer api key
+  INDEXER_API_KEY:  "{{ .Values.data.indexerApiKey }}"
+  
+  
+# Elastic
+  ELASTIC_HOST:  "{{ .Values.data.elasticHost }}"
+  ELASTIC_PORT:  "{{ .Values.data.elasticPort }}"
+  ELASTIC_USER_PASSWORD:  "{{ .Values.data.elasticUserPassword }}"
+  security.https.certificate.trust:  "{{ .Values.data.ibmElasticSSLSecurity }}"
+
+# Keycloak
+  ibm.keycloak.endpoint_url:  "keycloak-discovery:8080"
+  ibm.keycloak.realm:  "{{ .Values.data.keycloakRealm }}"
+  ibm.keycloak.useremail:  "{{ .Values.data.keycloakUserEmail }}"
+  ibm.keycloak.username:  "{{ .Values.data.keycloakUsername }}"
+  ibm.keycloak.password:  "{{ .Values.data.keycloakPassword }}"
+  ibm.keycloak.client_id:  "{{ .Values.data.keycloakClientId }}"
+  ibm.keycloak.client_secret:  "{{ .Values.data.keycloakClientSecret }}"
+  
+  
+# AMQ
+  amqphub.amqp10jms.remote-url:  "{{ .Values.data.amqpUrl }}"
+  amqphub.amqp10jms.username:  "{{ .Values.data.amqpUsername }}"
+  amqphub.amqp10jms.password:  "{{ .Values.data.amqpUserPassword }}"
+  INDEXER_QUEUE_HOST:  "{{ .Values.data.amqpUrl }}"
+  indexer.queue.key:  "{{ .Values.data.indexerQueueKey }}"  
+  
+  storage_service_url:  "http://{{ .Release.Name }}-ibm-storage-deploy:8080"
+  SCHEMA_HOST:  "http://{{ .Release.Name }}-ibm-schema-deploy:8080/api/schema-service/v1/schema"
+  STORAGE_SCHEMA_HOST:  "http://{{ .Release.Name }}-ibm-storage-deploy:8080/api/storage/v2/schemas"
+  STORAGE_QUERY_RECORD_HOST:  "http://{{ .Release.Name }}-ibm-storage-deploy:8080/api/storage/v2/query/records"
+  STORAGE_QUERY_KINDS_HOST:  "http://{{ .Release.Name }}-ibm-storage-deploy:8080/api/storage/v2/query/kinds"
+  STORAGE_QUERY_RECORD_FOR_CONVERSION_HOST:  "http://{{ .Release.Name }}-ibm-storage-deploy:8080/api/storage/v2/query/records:batch"
+  STORAGE_RECORDS_BATCH_SIZE:  "{{ .Values.data.storageRecordsBatchSize }}"
+  STORAGE_RECORDS_BY_KIND_BATCH_SIZE:  "{{ .Values.data.storageRecordsByKindBatchSize }}"
+  
+#db
+
+  ibm.db.url: "http://{{ .Release.Name }}-couchdb:5984"
+  ibm.db.user: "{{ .Values.data.dbUser }}"
+  ibm.db.password: "{{ .Values.data.dbPassw }}"
+    
+  
+  
+
+#Authorization  
+  AUTHORIZE_API: "http://{{ .Release.Name }}-ibm-entitlement-deploy:8080/api/entitlements/v2"
+  DEPLOYMENT_ENVIRONMENT: "{{ .Values.data.deployEnv }}"
+
+#tenant-validation
+  PARTITION_API: "http://{{ .Release.Name }}-ibm-partition-deploy:8080/api/partition/v1"
+  partition.keycloak.client_id: "{{ .Values.data.pKCClientId }}"
+  partition.keycloak.client_secert: "{{ .Values.data.pKCClientSecret }}"
+  partition.keycloak.grant_type: "{{ .Values.data.grantType }}"
+  partition.keycloak.password: "{{ .Values.data.pKCPassword }}"
+  partition.keycloak.realm: "{{ .Values.data.keycloakRealm }}"
+  partition.keycloak.url: "{{ .Values.data.pKCEndPointHost }}"
+  partition.keycloak.user: "{{ .Values.data.pKCUser }}"
+  partition.keycloak.accept_http: "{{ .Values.data.pKAcceptHttp }}"
+  tenantCache.exp.time.in.second: "{{ .Values.data.tenantCacheExpiryInSec }}"

devops/ibm/ibm-indexer-config/values.yaml

+data:
+# common
+  javaAppJar: "/deployments/*-spring-boot.jar"
+  serverPort: 8080
+  contextPath: "/api/indexer/v2"
+  envPrefix: ibm-iks
+  envPrefixProject: ibm-ibm-build
+  
+# log
+  logPrefix: indexer
+  loggingLevelOsdu: debug
+  loggingLevelSpring: debug
+
+# ibm 
+  beanDefOverriding: true
+  healthCheckUri: "/api/indexer/v2/info,/api/indexer/v2/liveness_check,/api/indexer/v2/readiness_check"
+ 
+#authorization
+  #check cm template
+  authorizeAPI: http://TBD:8080/api/entitlements/v2
+  deployEnv: CLOUD
+  
+#elastic
+  elasticHost: elasticsearch-master
+  elasticPort: 9200
+  elasticUserPassword: tbd
+  ibmElasticSSLSecurity: true
+  
+#db 
+  dbURL: http://tbd:5984
+  dbUser: admin
+  dbPassw: tbd
+  
+  
+#keycloack
+  keycloakUrl: tbd
+  keycloakRealm: OSDU
+  keycloakUserEmail: admin-sa@ibm.com
+  keycloakUsername: admin-sa
+  keycloakPassword: changeit
+  keycloakClientId: osdu-login
+  keycloakClientSecret: referenv 
+  
+# AmQP
+  amqpUrl: amqp://ex-aao-amqp-0-svc:5672 
+  amqpUsername: tbd
+  amqpUserPassword: tbd
+  indexerQueueKey: abcd
+   
+ 
+
+#apikey
+  indexerApiKey: this_123_is_456_dev_789_key
+  storageRecordsBatchSize: 20
+  storageRecordsByKindBatchSize: 100
+  
+
+#tenant-validation
+  pKCEndPointHost: referenv
+  pKCClientId: partition-service
+  pKCClientSecret: referenv
+  grantType: password
+  pKCPassword: changeit
+  pKCUser: partition-service-admin
+  pKAcceptHttp: true
+  tenantCacheExpiryInSec: 10000
+  #refer-cm-template
+  patitionAPI: refer-configmap-template
+
+
+conf:
+  configmap: "indexer-config"

devops/ibm/ibm-indexer-deploy/.helmignore

+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

devops/ibm/ibm-indexer-deploy/Chart.yaml

+apiVersion: v2
+name: ibm-indexer-deploy
+description: A Helm chart for Kubernetes
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.1.0
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+# It is recommended to use it with quotes.
+appVersion: "1.16.0"

devops/ibm/ibm-indexer-deploy/templates/NOTES.txt

+1. Get the application URL by running these commands:
+{{- if .Values.ingress.enabled }}
+{{- range $host := .Values.ingress.hosts }}
+  {{- range .paths }}
+  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
+  {{- end }}
+{{- end }}
+{{- else if contains "NodePort" .Values.service.type }}
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "ibm-indexer-deploy.fullname" . }})
+  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" .Values.service.type }}
+     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "ibm-indexer-deploy.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "ibm-indexer-deploy.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+  echo http://$SERVICE_IP:{{ .Values.service.port }}
+{{- else if contains "ClusterIP" .Values.service.type }}
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "ibm-indexer-deploy.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
+  echo "Visit http://127.0.0.1:8080 to use your application"
+  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
+{{- end }}

devops/ibm/ibm-indexer-deploy/templates/_helpers.tpl

+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "ibm-indexer-deploy.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "ibm-indexer-deploy.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "ibm-indexer-deploy.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "ibm-indexer-deploy.labels" -}}
+helm.sh/chart: {{ include "ibm-indexer-deploy.chart" . }}
+{{ include "ibm-indexer-deploy.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "ibm-indexer-deploy.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "ibm-indexer-deploy.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "ibm-indexer-deploy.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "ibm-indexer-deploy.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}

devops/ibm/ibm-indexer-deploy/templates/deployment.yaml

+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "ibm-indexer-deploy.fullname" . }}
+  labels:
+    {{- include "ibm-indexer-deploy.labels" . | nindent 4 }}
+spec:
+  {{- if not .Values.autoscaling.enabled }}
+  replicas: {{ .Values.replicaCount }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "ibm-indexer-deploy.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "ibm-indexer-deploy.selectorLabels" . | nindent 8 }}
+        sidecar.istio.io/inject: "{{ .Values.sidecarIstioInjected }}"
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "ibm-indexer-deploy.serviceAccountName" . }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      initContainers:
+        - name: {{ .Values.initimage.name }}
+          image: {{ .Values.initimage.initrepository }}:{{ .Values.initimage.tag }}
+          imagePullPolicy: {{ .Values.initimage.pullPolicy }} 
+          command: ['sh', '-c', './health_probe.sh $(HEALTH_URI)/info && sleep 5'] 
+          env:
+            - name: HEALTH_URI
+              valueFrom:
+                configMapKeyRef:
+                  name: indexer-config
+                  key: AUTHORIZE_API  
+      containers:
+        - name: {{ .Chart.Name }}
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+            - name: amqphub.amqp10jms.password
+              valueFrom:
+                secretKeyRef:
+                  key: AMQ_PASSWORD
+                  name: ex-aao-credentials-secret
+            - name: amqphub.amqp10jms.username
+              valueFrom:
+                secretKeyRef:
+                  key: AMQ_USER
+                  name: ex-aao-credentials-secret 
+            - name: partition.keycloak.client_secert
+              valueFrom:
+                secretKeyRef:
+                  key: partition_service_secret_data
+                  name: props-secret-generated-password
+            - name: ibm.db.password
+              valueFrom:
+                secretKeyRef:
+                  key: adminPassword
+                  name: {{ .Release.Name }}-couchdb
+            - name: partition.keycloak.url
+              valueFrom:
+                configMapKeyRef:
+                  key: partition.keycloak.url
+                  name: partition-config
+            - name: ibm.keycloak.endpoint_url
+              valueFrom:
+                configMapKeyRef:
+                  key: partition.keycloak.url
+                  name: partition-config
+            - name: ibm.keycloak.client_secret
+              valueFrom:
+                secretKeyRef:
+                  key: osdu_login_secret_data
+                  name: props-secret-generated-password      
+            - name: ELASTIC_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  key: password
+                  name: elasticsearch-master-credentials
+            - name: ELASTIC_USER_PASSWORD
+              value: elastic:$(ELASTIC_PASSWORD)
+          envFrom:
+          - configMapRef:
+              name: "{{ .Values.conf.configmap }}"        
+          ports:
+            - name: http
+              containerPort: 8080
+              protocol: TCP
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}

devops/ibm/ibm-indexer-deploy/templates/hpa.yaml

+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ include "ibm-indexer-deploy.fullname" . }}
+  labels:
+    {{- include "ibm-indexer-deploy.labels" . | nindent 4 }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ include "ibm-indexer-deploy.fullname" . }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}

devops/ibm/ibm-indexer-deploy/templates/ingress.yaml

+{{- if .Values.ingress.enabled -}}
+{{- $fullName := include "ibm-indexer-deploy.fullname" . -}}
+{{- $svcPort := .Values.service.port -}}
+{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
+  {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
+  {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
+  {{- end }}
+{{- end }}
+{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1
+{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1beta1
+{{- else -}}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Ingress
+metadata:
+  name: {{ $fullName }}
+  labels:
+    {{- include "ibm-indexer-deploy.labels" . | nindent 4 }}
+  {{- with .Values.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
+  ingressClassName: {{ .Values.ingress.className }}
+  {{- end }}
+  {{- if .Values.ingress.tls }}
+  tls:
+    {{- range .Values.ingress.tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+        {{- end }}
+      secretName: {{ .secretName }}
+    {{- end }}
+  {{- end }}
+  rules:
+    {{- range .Values.ingress.hosts }}
+    - host: {{ .host | quote }}
+      http:
+        paths:
+          {{- range .paths }}
+          - path: {{ .path }}
+            {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
+            pathType: {{ .pathType }}
+            {{- end }}
+            backend:
+              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
+              service:
+                name: {{ $fullName }}
+                port:
+                  number: {{ $svcPort }}
+              {{- else }}
+              serviceName: {{ $fullName }}
+              servicePort: {{ $svcPort }}
+              {{- end }}
+          {{- end }}
+    {{- end }}
+{{- end }}

devops/ibm/ibm-indexer-deploy/templates/istio-authzpolicy.yaml

+apiVersion: security.istio.io/v1beta1
+kind: AuthorizationPolicy
+metadata:
+  name: {{ .Values.conf.appName }}-authz-policy
+spec:
+  selector:
+    matchLabels:
+      {{- include "ibm-indexer-deploy.selectorLabels" . | nindent 6 }}
+  action: DENY
+  rules:
+  - from:
+    - source:
+        notRequestPrincipals:
+        - '*'
+    to:
+    - operation:
+        notPaths:
+        - '*/v2/api-docs'
+        - /api/indexer/v2/info
+        - /api/indexer/v2/liveness_check
+        - /api/indexer/v2/readiness_check
+        - /api/indexer/v2/_dps/task-handlers/index-worker
\ No newline at end of file

devops/ibm/ibm-indexer-deploy/templates/istio-virtualservice.yaml

+apiVersion: networking.istio.io/v1beta1
+kind: VirtualService
+metadata:
+  name: {{ .Values.conf.appName }}-vs
+spec:
+  gateways:
+  - osdu-gateway
+  hosts:
+    {{- if .Values.conf.domain }}
+    - {{ printf "osdu.%s" .Values.conf.domain | quote }}
+    {{- else if .Values.conf.loadbalancerIP}}
+    - {{ (index (lookup "v1" "Service" "istio-ingress" "istio-ingress").status.loadBalancer.ingress 0).ip }}
+    {{- else if .Values.conf.loadbalancerHN}}
+    - {{ (index (lookup "v1" "Service" "istio-ingress" "istio-ingress").status.loadBalancer.ingress 0).hostname }}    
+    {{- else }}
+    - "*"
+    {{- end }}
+  http:
+  - match:
+    - uri:
+        prefix: /api/indexer/
+    route:
+    - destination:
+        host: {{ .Release.Name }}-ibm-indexer-deploy
+        port:
+          number: 8080

devops/ibm/ibm-indexer-deploy/templates/service.yaml

+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "ibm-indexer-deploy.fullname" . }}
+  labels:
+    {{- include "ibm-indexer-deploy.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    {{- include "ibm-indexer-deploy.selectorLabels" . | nindent 4 }}

devops/ibm/ibm-indexer-deploy/templates/serviceaccount.yaml

+{{- if .Values.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "ibm-indexer-deploy.serviceAccountName" . }}
+  labels:
+    {{- include "ibm-indexer-deploy.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}

devops/ibm/ibm-indexer-deploy/templates/tests/test-connection.yaml

+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ include "ibm-indexer-deploy.fullname" . }}-test-connection"
+  labels:
+    {{- include "ibm-indexer-deploy.labels" . | nindent 4 }}
+  annotations:
+    "helm.sh/hook": test
+spec:
+  containers:
+    - name: wget
+      image: busybox
+      command: ['wget']
+      args: ['{{ include "ibm-indexer-deploy.fullname" . }}:{{ .Values.service.port }}']
+  restartPolicy: Never

devops/ibm/ibm-indexer-deploy/values.yaml

+# Default values for ibm-indexer-deploy.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+sidecarIstioInjected: "true"
+
+image:
+  repository: community.opengroup.org:5555/osdu/platform/system/indexer-service/os-indexer-ibm
+  pullPolicy: IfNotPresent
+  # Overrides the image tag whose default is the chart appVersion.
+  tag: "release-0.14-apr22"
+
+imagePullSecrets: []
+nameOverride: ""
+fullnameOverride: ""
+initimage:
+  name: dependency-check
+  initrepository: community.opengroup.org:5555/osdu/platform/deployment-and-operations/ibm-osdu-provisioning/k8s-healthprobe
+  pullPolicy: IfNotPresent
+  tag: "v2.0"
+conf:  
+  configmap: "indexer-config"
+  appName: "indexer"  
+
+serviceAccount:
+  # Specifies whether a service account should be created
+  create: true
+  # Annotations to add to the service account
+  annotations: {}
+  # The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name: ""
+
+podAnnotations: {}
+
+podSecurityContext: {}
+  # fsGroup: 2000
+
+securityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+service:
+  type: ClusterIP
+  port: 8080
+
+ingress:
+  enabled: false
+  className: ""
+  annotations: {}
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
+  hosts:
+    - host: chart-example.local
+      paths:
+        - path: /
+          pathType: ImplementationSpecific
+  tls: []
+  #  - secretName: chart-example-tls
+  #    hosts:
+  #      - chart-example.local
+
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+autoscaling:
+  enabled: false
+  minReplicas: 1
+  maxReplicas: 3
+  targetCPUUtilizationPercentage: 80
+  # targetMemoryUtilizationPercentage: 80
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}