fix problem with installed clowder version

fixed ingress rules

Author: robkooper

.gitignore

@@ -5,7 +5,7 @@ charts
 .cr-release-packages
 clowder-*.tgz
 
-
 # custom values
-/secrets-*.yaml
-/values-*.yaml
+secrets-*.yaml
+values-*.yaml
+*.values.yaml

Chart.lock

@@ -10,6 +10,6 @@ dependencies:
   version: 7.6.9
 - name: elasticsearch2
   repository: https://opensource.ncsa.illinois.edu/charts/
-  version: 0.2.1
-digest: sha256:6a590b13f66b9e7564ad234c8392551e3d190fef4c202d66ffcb509a45763421
-generated: "2021-02-04T16:17:53.437178-06:00"
+  version: 0.2.2
+digest: sha256:6f600ded45e6ecefc54382e7d4b12a9c4f8739c47c4232b4f8992066fbb256ba
+generated: "2021-02-09T20:43:39.752242-06:00"

Chart.yaml

@@ -13,7 +13,7 @@ description: >
 # 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.9.0
+version: 0.9.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
@@ -34,8 +34,9 @@ annotations:
     - name: Helm Chart
       url: https://github.com/clowder-framework/clowder-helm
   artifacthub.io/changes: |
-    - update clowder to 1.14.1
-    - helm chart now in https://github.com/clowder-framework/clowder-helm
+    - Forgot to increate clowder version tag.
+    - Now using appVersion for clowder version tag by default.
+    - Using `networking.k8s.io/v1` for ingress rules
 
 # Dependencies for clowder. Some of the dependencies are only installed if they
 # are enabled.
@@ -54,6 +55,6 @@ dependencies:
     condition: rabbitmq.enabled
   - name: elasticsearch2
     alias: elasticsearch
-    version: 0.2.1
+    version: ~0.2
     repository: https://opensource.ncsa.illinois.edu/charts/
     condition: elasticsearch.enabled

templates/deployment.yaml

@@ -44,7 +44,7 @@ spec:
 {{- $mongodburi := include "clowder.mongodburi" . }}
 {{- range $index, $element := .Values.users }}
         - name: mongo-add-user-{{ $index }}
-          image: "{{ $.Values.image.repository }}/mongo-init:{{ $.Values.image.tag }}"
+          image: "{{ $.Values.image.repository }}/mongo-init:{{ $.Values.image.tag | default $.Chart.AppVersion }}"
           imagePullPolicy: {{ $.Values.image.pullPolicy }}
           env:
             - name: MONGO_URI
@@ -73,7 +73,7 @@ spec:
 {{- end }}
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}/{{ .Values.image.name }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}/{{ .Values.image.name }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command:
             - /home/clowder/clowder.sh

templates/ingress.yaml

@@ -1,6 +1,6 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "clowder.fullname" . -}}
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
@@ -28,16 +28,22 @@ spec:
       http:
         paths:
           - path: {{ $.Values.ingress.path }}
+            pathType: ImplementationSpecific
             backend:
-              serviceName: {{ $fullName }}
-              servicePort: clowder
+              service:
+                name: {{ $fullName }}
+                port:
+                  name: clowder
   {{- end }}
 {{- else }}
     - http:
         paths:
           - path: {{ $.Values.ingress.path }}
+            pathType: ImplementationSpecific
             backend:
-              serviceName: {{ $fullName }}
-              servicePort: clowder
+              service:
+                name: {{ $fullName }}
+                port:
+                  name: clowder
 {{- end }}
 {{- end }}

templates/monitor/deployment.yaml

@@ -33,7 +33,7 @@ spec:
                   key: rabbitmq-uri
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}/monitor:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}/monitor:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: monitor

templates/monitor/ingress.yaml

@@ -1,7 +1,7 @@
 {{- if .Values.monitor.enabled }}
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "clowder.fullname" . -}}
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ $fullName }}-monitor
@@ -29,17 +29,23 @@ spec:
       http:
         paths:
           - path: {{ $.Values.ingress.path }}monitor/
+            pathType: ImplementationSpecific
             backend:
-              serviceName: {{ $fullName }}-monitor
-              servicePort: monitor
+              service:
+                name: {{ $fullName }}-monitor
+                port:
+                  name: monitor
   {{- end }}
 {{- else }}
     - http:
         paths:
           - path: {{ $.Values.ingress.path }}monitor/
+            pathType: ImplementationSpecific
             backend:
-              serviceName: {{ $fullName }}-monitor
-              servicePort: monitor
+              service:
+                name: {{ $fullName }}-monitor
+                port:
+                  name: monitor
 {{- end }}
 {{- end }}
 {{- end }}

values.yaml

@@ -5,7 +5,7 @@
 image:
   repository: clowder
   name: clowder
-  tag: 1.13.0
+  tag: null
   checks: "ncsa/checks:1.0.0"
   pullPolicy: IfNotPresent