Merge pull request #8 from energywebfoundation/DOI-1716-did-proxy-helm

DOI-1716-helm-basic-version
energywebfoundation · Mar 4, 2022 · 2d4189f · 2d4189f
2 parents 1106b1a + 7daf374
commit 2d4189f
Show file tree

Hide file tree

Showing 7 changed files with 1,551 additions and 21 deletions.
diff --git a/Chart.yaml b/Chart.yaml
@@ -16,15 +16,15 @@ 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.0.7
+version: 0.0.8
 
 # 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: "0.0.7"
+appVersion: "0.0.8"
 
 dependencies:
-  - name: nginx
-    version: 9.7.5
+  - name: redis
+    version: 16.4.0
     repository: https://charts.bitnami.com/bitnami
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # did-auth-proxy-helm
 
-![Version: 0.0.7](https://img.shields.io/badge/Version-0.0.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.7](https://img.shields.io/badge/AppVersion-0.0.7-informational?style=flat-square)
+![Version: 0.0.8](https://img.shields.io/badge/Version-0.0.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.8](https://img.shields.io/badge/AppVersion-0.0.8-informational?style=flat-square)
 
 A Helm chart for DID auth proxy
 
@@ -10,7 +10,7 @@ A Helm chart for DID auth proxy
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://charts.bitnami.com/bitnami | nginx | 9.7.5 |
+| https://charts.bitnami.com/bitnami | redis | 16.4.0 |
 
 ## Values
 
@@ -19,6 +19,8 @@ A Helm chart for DID auth proxy
 | affinity | object | `{}` |  |
 | appValues.ACCEPTED_ROLES | string | `"role1.roles.app-test2.apps.artur.iam.ewc"` |  |
 | appValues.CACHE_SERVER_LOGIN_PRVKEY | string | `"eab5e5ccb983fad7bf7f5cb6b475a7aea95eff0c6523291b0c0ae38b5855459c"` |  |
+| appValues.JWT_ACCESS_TTL | int | `3600` |  |
+| appValues.JWT_REFRESH_TTL | int | `86400` |  |
 | appValues.JWT_SECRET | string | `"asecretstring"` |  |
 | appValues.PORT | int | `80` |  |
 | autoscaling.enabled | bool | `false` |  |
@@ -29,10 +31,10 @@ A Helm chart for DID auth proxy
 | config.enabled | bool | `false` |  |
 | config.secretRefName | object | `{}` |  |
 | fullnameOverride | string | `"did-auth-proxy-helm"` |  |
-| image.pullPolicy | string | `"IfNotPresent"` |  |
+| image.pullPolicy | string | `"Always"` |  |
 | image.repository | string | `"098061033856.dkr.ecr.us-west-2.amazonaws.com/did-auth-proxy"` |  |
 | image.tag | string | `"latest"` |  |
-| imagePullSecrets | list | `[]` |  |
+| imagePullSecrets[0].name | string | `"regcred"` |  |
 | ingress.annotations | object | `{}` |  |
 | ingress.className | string | `""` |  |
 | ingress.enabled | bool | `false` |  |
@@ -43,9 +45,13 @@ A Helm chart for DID auth proxy
 | nameOverride | string | `"did-auth-proxy-helm"` |  |
 | nodeSelector | object | `{}` |  |
 | opsValues.CACHE_SERVER_URL | string | `"https://identitycache-dev.energyweb.org/v1"` |  |
+| opsValues.REDIS_HOST | string | `"did-proxy-auth-redis-master.did-auth.svc.cluster.local"` |  |
+| opsValues.REDIS_PASSWORD | string | `"redis"` |  |
+| opsValues.REDIS_PORT | int | `6379` |  |
 | opsValues.RPC_URL | string | `"https://volta-rpc.energyweb.org/"` |  |
 | podAnnotations | object | `{}` |  |
 | podSecurityContext | object | `{}` |  |
+| redis.auth.password | string | `"redis"` |  |
 | replicaCount | int | `1` |  |
 | resources | object | `{}` |  |
 | sealedSecret.annotations | object | `{}` |  |

diff --git a/charts/redis-16.4.0.tgz b/charts/redis-16.4.0.tgz
diff --git a/templates/deployment.yaml b/templates/deployment.yaml
@@ -58,14 +58,14 @@ spec:
             - name: http
               containerPort: {{ .Values.appValues.PORT }}
               protocol: TCP
-          livenessProbe:
-            httpGet:
-              path: /
-              port: http
-          readinessProbe:
-            httpGet:
-              path: /
-              port: http
+          # livenessProbe:
+          #   httpGet:
+          #     path: /
+          #     port: http
+          # readinessProbe:
+          #   httpGet:
+          #     path: /
+          #     port: http
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}

diff --git a/values-nginx.yaml → values-nginx.yaml.disabled b/values-nginx.yaml → values-nginx.yaml.disabled
@@ -404,7 +404,34 @@ nginx:
   ##     }
   ##   }
   ##
-  serverBlock: ""
+  serverBlock: |-
+    server {
+        listen       80;
+        listen  [::]:80;
+        server_name  _;
+        resolver 172.20.0.10 ipv6=off valid=60s;
+
+        location = /auth/login {
+            proxy_pass http://did-auth-proxy-helm.did-auth.svc.cluster.local/auth/login;
+        }
+
+        location = /auth/refresh-token {
+            proxy_pass http://did-auth-proxy-helm.did-auth.svc.cluster.local/auth/refresh-token;
+        }
+
+        location / {
+            auth_request /token_introspection;
+            proxy_pass http://backend-nginx.did-auth.svc.cluster.local;
+        }
+
+        location = /token_introspection {
+            internal;
+            proxy_method      GET;
+            proxy_set_header  Authorization "$http_authorization";
+            proxy_set_header  Content-Length "";
+            proxy_pass        http://did-auth-proxy-helm.did-auth.svc.cluster.local/auth/token-introspection;
+        }
+    }
   ## @param existingServerBlockConfigmap ConfigMap with custom server block to be added to NGINX configuration
   ## NOTE: This will override serverBlock
   ##