Working version of stack again

Some minor changes were required to get the stack passing its testing layer. This is partly in readyness for the 1.5.7 release.
featurehub-io · Mar 13, 2022 · 65d0448 · 65d0448
1 parent 55321ae
commit 65d0448
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 15 deletions.
diff --git a/helm/README.adoc b/helm/README.adoc
@@ -4,10 +4,11 @@ These instructions are designed to get you up and running on a local kubernetes
 fleshed out over time as we have these examples running on Google's GKE/Autopilot, AWS's EKS/Fargate, and Azure's
 AKS.
 
-== Overview
+NOTE: This set of Helm charts is designed to be run the local kinD cluster and be fully operable by anyone following
+these instructions. Without modification of the values in the charts, it is not intended to be production ready just
+"go". That said, considerable effort has been put in by contributors to make this as easy to adapt to your needs as possible.
 
-For this we ship with a simple postgres, and instructions on how to get NATs into your cluster from the external
-sources. There are plenty of helm charts for NATs.
+Please feel free to visit our https://docs.featurehub.io[documentation] for further information.
 
 == Steps
 
@@ -36,7 +37,12 @@ kubectl wait --namespace ingress-nginx \
   --selector=app.kubernetes.io/component=controller \
   --timeout=90s
 ----
-=== 4. Install FeatureHub (with defaults)
+
+=== 4. Install Chart dependencies
+
+ $ cd featurehub && helm dependency update && cd ..
+
+=== 5. Install FeatureHub (with defaults)
 
 [source,bash]
 ----
@@ -57,8 +63,25 @@ To update it with config changes, just
 helm upgrade featurehub featurehub
 ----
 
+It should show something like this:
+
+ $  kubectl get pods
+
+----
+NAME                                                READY   STATUS              RESTARTS   AGE
+featurehub-dacha-7d65db8c48-r59l6                   0/1     Pending             0          7s
+featurehub-dacha-7d65db8c48-zqb8s                   0/1     Running             0          8s
+featurehub-edge-86b6b5cf46-4cqvr                    0/1     ContainerCreating   0          7s
+featurehub-edge-86b6b5cf46-n8cm5                    0/1     ContainerCreating   0          8s
+featurehub-management-repository-567b8fbffb-7vcbf   0/1     ContainerCreating   0          8s
+featurehub-nats-0                                   0/3     ContainerCreating   0          8s
+featurehub-nats-1                                   2/3     Running             0          7s
+featurehub-nats-2                                   0/3     Pending             0          7s
+featurehub-nats-box-78587c4478-nkbzt                0/1     ContainerCreating   0          8s
+featurehub-postgresql-0                             0/1     Running             0          8s
+----
 
-=== 5. Test
+=== 6. Test
 
 It should be running on port 80, so you can login, create a new system, add features, etc. The Edge service is
-also running on port 80. 
+also running on port 80.
diff --git a/helm/featurehub/Chart.yaml b/helm/featurehub/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: featurehub
 description: FeatureHub Release
 type: application
-version: 3.0.0
+version: 3.0.1
 icon: https://feature-hub.io/img/png/favicon.png
 appVersion: "1.5.6"
 dependencies:

diff --git a/helm/featurehub/templates/global-ingress.yaml b/helm/featurehub/templates/global-ingress.yaml
@@ -0,0 +1,27 @@
+{{- if .Values.global.ingress.enabled -}}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: featurehub
+  labels:
+  {{- with .Values.global.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  defaultBackend:
+    service:
+      name: "featurehub-management-repository"
+      port:
+        name: http
+  rules:
+    - http:
+        paths:
+          - path: /features
+            pathType: Prefix
+            backend:
+              service:
+                name: "featurehub-edge"
+                port:
+                  name: http
+  {{- end }}
diff --git a/helm/featurehub/values.yaml b/helm/featurehub/values.yaml
@@ -9,8 +9,13 @@ global:
   # As of 1.5.0 all FeatureHub controller properties are available as environment variables using the same case.
   # Entries accepted here are the same as would be specified in /etc/app-config/common.properties.
   environmentVars:
-    #nats.urls: ""
-
+    nats.urls: "nats://featurehub-nats"
+
+  # This is only used for the short-cut KinD ingress, you would not use this in your own cluster
+  ingress:
+    enabled: true
+    annotations: []
+
   # -- If `true`, entries from `environmentVars` will be mapped to /etc/app-config/common.properties file
   # To mount secret settings as /etc/app-config/common.properties see volume fields
   # Used for retrocompatiblity with FeatureHub controller versions lower than 1.5.0
@@ -22,7 +27,7 @@ global:
   # is that if `envAsAppConfigFile: true`, only entries from `environmentVars` will be mapped to the
   # common.properties configuration file, and not the ones from `extraEnvironmentVars`.
   extraEnvironmentVars: {}
-    
+
   # -- List of extra mounts to add to Management Repository Deployment
   extraVolumeMounts: []
     #- mountPath: /etc/app-config/secrets.properties
@@ -88,7 +93,7 @@ managementRepository:
 
   image:
     repository: featurehub/mr
-    tag: 1.5.6
+    tag: :1.5.6
 
   pullPolicy: IfNotPresent
 
@@ -125,8 +130,11 @@ managementRepository:
   # Note that `server.port` and `monitor.port` use their default values of `8085` and `8701` respectively, to make
   # it easier to implement the deployment, service and the prometheus serviceMonitor manifests.
   environmentVars:
-    db.url: jdbc:postgresql://setmeup-postgresql-endpoint:5432/featurehub
+    db.url: jdbc:postgresql://featurehub-postgresql:5432/featurehub
     db.username: featurehub
+    # normally you would not want this, but its for the postgres
+    db.password: featurehub
+    db.connections: "20"
     portfolio.admin.group.suffix: Administrators
 
   # -- If `true`, entries from `environmentVars` will be mapped to /etc/app-config/application.properties file
@@ -221,7 +229,7 @@ edge:
 
   image:
     repository: featurehub/edge
-    tag: 1.5.6
+    tag: :1.5.6
 
   pullPolicy: IfNotPresent
 
@@ -262,7 +270,7 @@ edge:
     update.pool-size: "30"
     listen.pool-size: "30"
     server.gracePeriodInSeconds: "10"
-    dacha.url.default: http://featurehub-dacha
+    dacha.url.default: http://featurehub-dacha:8600
 
   # -- If `true`, entries from `environmentVars` and `envFromSecret` fields will be mapped to configuration files.
   # `environmentVars` to /etc/app-config/application.properties
@@ -349,7 +357,7 @@ dacha:
 
   image:
     repository: featurehub/dacha
-    tag: 1.5.6
+    tag: :1.5.6
 
   pullPolicy: IfNotPresent