Do not require moduleVersion, expect MD to contain it

Author: jakub-id

README.md

@@ -24,16 +24,17 @@ the subchart must be configured with the following minimal values:
 
 ```yaml filename=values.yaml
 moduleUrl: "http://mod-x:80"
-moduleVersion: 0.1.0-main #used to replace @version@ placeholder in MD
 moduleDescriptor: |
   {
-    "id" : "mod-x-@version@",
+    "id" : "mod-x-0.1.0",
     "name" : "X Okapi module"
   }
 tenants:
 - mytenant
 
 ```
+It's recommended that the module version in the ModuleDescriptor follows the parent chart version.
+
 see [values.yaml](./chart/values.yaml) for a complete list of configuration options.
 
 The parent chart is then build with:

chart/templates/_validate.tpl

@@ -12,9 +12,6 @@
 {{- if not .Values.moduleDescriptor -}}
 {{- fail "A valid .Values.moduleDescriptor is required!" -}}
 {{- end -}}
-{{- if not .Values.moduleVersion -}}
-{{- fail "A valid .Values.moduleVersion is required!" -}}
-{{- end -}}
 {{- if empty .Values.tenants -}}
 {{- fail "A valid .Values.tenants is required!" -}}
 {{- end -}}

chart/templates/moddesc-configmap.yaml

@@ -6,4 +6,4 @@ metadata:
     {{- include "..labels" . | nindent 4 }}
 data:
   ModuleDescriptor: |
-    {{ .Values.moduleDescriptor | default "" | replace "@version@" .Values.moduleVersion | nindent 4 }}
+    {{ .Values.moduleDescriptor | nindent 4 }}

chart/values.yaml

@@ -14,8 +14,6 @@ tenants: []
 
 #REQUIRED values with defaults in the subchart, may be overridden by parent chart:
 
-#Used to replace @version@ in the module descriptor, must be specified only if @version@ placeholder is used
-moduleVersion: "0.1.0"
 #Okapi base URL with scheme and port
 okapiUrl: "http://okapi:9130"
 #Okapi secret name, the secret must include OKAPI_USER/OKAPI_PASS or OKAPI_TOKEN keys