ops: Creating Chart. Initialize chart. AddDeployments

Author: alhendrickson

deployment/kubernetes/charts/medcat-trainer-helm/Chart.yaml

@@ -15,13 +15,13 @@ 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
+version: 0.0.1
 
 # 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"
+appVersion: "latest"
 
 # Chart.yaml
 dependencies:

deployment/kubernetes/charts/medcat-trainer-helm/templates/NOTES.txt

@@ -15,7 +15,7 @@
   export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "medcat-trainer-helm.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 "medcat-trainer-helm.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "medcat-trainer-helm.name" . }},app.kubernetes.io/instance={{ .Release.Name }},app.kubernetes.io/component=nginx" -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

deployment/kubernetes/charts/medcat-trainer-helm/templates/_helpers.tpl

@@ -65,12 +65,14 @@ Create the name of the service account to use
 
 {{- /*
 Return Solr host: either user-supplied or constructed from release name
+
+TODO: Make Solr use the chart fullname instead of release name
 */ -}}
 {{- define "medcat-trainer-helm.solrHost" -}}
 {{- if .Values.solrHost }}
 {{ .Values.solrHost }}
 {{- else }}
-{{- include "medcat-trainer-helm.fullname" . }}-solr
+{{- .Release.Name }}-solr
 {{- end }}
 {{- end }}
 

deployment/kubernetes/charts/medcat-trainer-helm/templates/deployment.yaml

@@ -144,7 +144,7 @@ data:
     }
   sitesenabled.medcattrainer: |
     server {
-        listen 8000;
+        listen {{ .Values.service.port }};
         server_name localhost;
         charset utf-8;
         large_client_header_buffers 4 32k;

deployment/kubernetes/charts/medcat-trainer-helm/templates/env-configmap.yaml

@@ -2,6 +2,22 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+# This will set the replicaset count more information can be found here: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/
+replicaCount: 1
+
+# This sets the container image more information can be found here: https://kubernetes.io/docs/concepts/containers/images/
+image:
+  repository: cogstacksystems/medcat-trainer
+  # This sets the pull policy for images.
+  pullPolicy: Always
+  # Overrides the image tag whose default is the chart appVersion.
+  tag: "latest"
+nginxImage:
+  repository: nginx
+  pullPolicy: IfNotPresent
+  tag: "1.29.1"
+
+# Add any environment variables here that should be set in the medcat-trainer container
 env:
   CSRF_TRUSTED_ORIGINS: "http://localhost:8000"
   DB_ENGINE: "sqlite3"
@@ -53,17 +69,22 @@ medcatConfig: |
     # use this spacy model
     cat.general.spacy_model = 'en_core_web_md'
 
-
-# This will set the replicaset count more information can be found here: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/
-replicaCount: 1
-
-# This sets the container image more information can be found here: https://kubernetes.io/docs/concepts/containers/images/
-image:
-  repository: nginx
-  # This sets the pull policy for images.
-  pullPolicy: IfNotPresent
-  # Overrides the image tag whose default is the chart appVersion.
-  tag: ""
+solr:
+  # replicaCount: 1
+  # collectionShards: 1
+  # collectionReplicas: 1
+  zookeeper:
+  #   replicaCount: 1
+    persistence:
+      size: 1Gi
+  persistence:
+    size: 1Gi
+  auth:
+    # TODO: support SOLR auth from medcat trainer API
+    enabled: false
+  podLabels:
+    app.kubernetes.io/component: solr
+    app.kubernetes.io/part-of: cogstack
 
 # This is for the secrets for pulling an image from a private repository more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
 imagePullSecrets: []
@@ -106,7 +127,7 @@ service:
   # This sets the service type more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types
   type: ClusterIP
   # This sets the ports more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/#field-spec-ports
-  port: 80
+  port: 8000
 
 # This block is for setting up the ingress for more information can be found here: https://kubernetes.io/docs/concepts/services-networking/ingress/
 ingress:
@@ -138,14 +159,15 @@ resources: {}
   #   memory: 128Mi
 
 # This is to setup the liveness and readiness probes more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/
-livenessProbe:
-  httpGet:
-    path: /
-    port: http
-readinessProbe:
-  httpGet:
-    path: /
-    port: http
+# TODO Add liveness and readiness to django app
+# livenessProbe:
+#   httpGet:
+#     path: /
+#     port: http
+# readinessProbe:
+#   httpGet:
+#     path: /
+#     port: http
 
 # This section is for setting up autoscaling more information can be found here: https://kubernetes.io/docs/concepts/workloads/autoscaling/
 autoscaling:
@@ -173,15 +195,3 @@ nodeSelector: {}
 tolerations: []
 
 affinity: {}
-
-solr:
-  # replicaCount: 1
-  # collectionShards: 1
-  # collectionReplicas: 1
-  # zookeeper:
-  #   replicaCount: 1
-  persistence:
-    size: 1Gi
-  auth:
-    # TODO: support SOLR auth from medcat trainer API
-    enabled: false