Merge branch 'main' into add-default-values-for-krbkeysoperator-names…

…paces
AMRC-FactoryPlus · Jul 3, 2023 · 375c21a · 375c21a
2 parents 8348fc4 + 41be8a6
commit 375c21a
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 18 deletions.
diff --git a/.github/workflows/publish-helm.yml b/.github/workflows/publish-helm.yml
@@ -2,12 +2,13 @@ name: New Release
 
 on:
   release:
-    types: [created]
+    types: [ created ]
     # Only run the action when the release tag matches the pattern v[0-9]+.[0-9]+.[0-9]+
     branches:
       - 'v[0-9]+.[0-9]+.[0-9]+'
 
 jobs:
+  # This job packages up the Helm chart
   build:
     runs-on: ubuntu-latest
     steps:
@@ -22,14 +23,40 @@ jobs:
         run: |
           TAG=${{ github.event.release.tag_name }}
           helm package -u -d build --version=$TAG --app-version=$TAG .
+      - uses: actions/upload-artifact@v3
+        with:
+          name: new-release
+          path: build/amrc-connectivity-stack-${{ github.event.release.tag_name }}.tgz
+
+  # This job checks out the release branch, adds the new release to the /builds folder, builds the index and commits
+  # the changes, which triggers Github to release it as a new pages repo
+  release:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install Helm
+        run: |
+          curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          ref: release
+      - name: add-new-release
+        uses: actions/download-artifact@v3
+        with:
+          name: new-release
+          path: build
+      - name: Build index
+        run: |
           cd build
           helm repo index --url https://amrc-factoryplus.github.io/amrc-connectivity-stack/build .
-      - uses: stefanzweifel/git-auto-commit-action@v4
+      - name: commit
+        uses: stefanzweifel/git-auto-commit-action@v4
         id: auto_commit_action
         with:
           commit_message: Release ${{ github.event.release.tag_name }}
           commit_user_name: GitHub Action
           commit_user_email: actions@github.com
           branch: release
           create_branch: true
-          push_options: '--force'
+          push_options: '--force'
diff --git a/README.md b/README.md
@@ -148,6 +148,7 @@ Production deployment does not differ greatly from development deployment, howev
 | identity.identity.image.tag               | string | `"latest"` | The tag of the Identity component |
 | identity.krbKeysOperator.namespaces       | string | `""` | A comma-separated list of namespaces that the KerberosKey Operator should watch for KerberosKey resources in. Defaults to the release namespace if not specified |
 | identity.krbKeysOperator.image.registry   | string | `"ghcr.io/amrc-factoryplus"` | The registry of the KerberosKey Operator |
+| identity.crossRealm                       | array  | `[]` | Enable support for cross-realm authentication |
 | identity.krbKeysOperator.image.repository | string | `"acs-krb-keys-operator"` | The repository of the KerberosKey Operator |
 | identity.krbKeysOperator.image.tag        | string | `"latest"` | The tag of the KerberosKey Operator |
 | identity.realm                            | string | `"LOCALHOST"` | The Kerberos realm for this Factory+ deployment. |

diff --git a/crds/kerberos-keys-crd.yaml b/crds/kerberos-keys-crd.yaml
@@ -1,4 +1,3 @@
-{{ if .Values.identity.enabled }}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
@@ -88,4 +87,3 @@ spec:
                                     pattern: "^[a-z0-9.-]+/[a-zA-Z0-9._-]+$"
             subresources:
                 status: {}
-{{- end -}}
diff --git a/crds/kubegres-crd.yaml b/crds/kubegres-crd.yaml
@@ -1,4 +1,3 @@
-{{ if .Values.postgres.enabled }}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
@@ -2114,4 +2113,3 @@ spec:
       storage: true
       subresources:
         status: {}
-{{- end -}}
diff --git a/templates/auth/principals/service-clients.yaml b/templates/auth/principals/service-clients.yaml
@@ -80,7 +80,7 @@ spec:
   secret: manager-keytab/client-keytab
 {{- end }}
 ---
-{{- if .Values.warehouse.enabled }}
+{{- if .Values.warehouse.ingester.enabled }}
 apiVersion: factoryplus.app.amrc.co.uk/v1
 kind: KerberosKey
 metadata:

diff --git a/values.yaml b/values.yaml
@@ -13,14 +13,22 @@ identity:
   enabled: true
   # -- The Kerberos realm for this Factory+ deployment.
   realm: LOCALHOST
+  # -- Enable support for cross-realm authentication
+  crossRealm: []
+  # crossRealm:
+  #   - realm: MYOTHERREALM.COM
+  #     domain: myotherrealm.com
+  #     otherDomains:
+  #       - myotherrealm.org
+  #       - myotherrealm.net
   identity:
     image:
       # -- The registry of the Identity component
       registry: ghcr.io/amrc-factoryplus
       # -- The repository of the Identity component
       repository: acs-identity
       # -- The tag of the Identity component
-      tag: latest
+      tag: v1.0.0
       # @ignore
       pullPolicy: IfNotPresent
   krbKeysOperator:
@@ -33,7 +41,7 @@ identity:
       # -- The repository of the KerberosKey Operator
       repository: acs-krb-keys-operator
       # -- The tag of the KerberosKey Operator
-      tag: latest
+      tag: v1.1.0
       # @ignore
       pullPolicy: IfNotPresent
 
@@ -46,7 +54,7 @@ auth:
     # -- The repository of the Authorisation component
     repository: acs-auth
     # -- The tag of the Authorisation component
-    tag: latest
+    tag: v1.0.0
     # @ignore
     pullPolicy: IfNotPresent
 
@@ -59,7 +67,7 @@ directory:
     # -- The repository of the Directory component
     repository: acs-directory
     # -- The tag of the Directory component
-    tag: latest
+    tag: v1.0.1
     # @ignore
     pullPolicy: IfNotPresent
 
@@ -72,7 +80,7 @@ configdb:
     # -- The repository of the Configuration Store component
     repository: acs-configdb
     # -- The tag of the Configuration Store component
-    tag: latest
+    tag: v1.0.0
     # @ignore
     pullPolicy: IfNotPresent
 
@@ -85,7 +93,7 @@ mqtt:
     # -- The repository of the MQTT component
     repository: acs-mqtt
     # -- The tag of the MQTT component
-    tag: latest
+    tag: v1.0.1
     # @ignore
     pullPolicy: IfNotPresent
 
@@ -98,7 +106,7 @@ manager:
     # -- The repository of the Manager component
     repository: acs-manager
     # -- The tag of the Manager component
-    tag: latest
+    tag: v1.0.5
     # @ignore
     pullPolicy: IfNotPresent
   edge:
@@ -107,7 +115,7 @@ manager:
     # -- The repository of the Edge Agent component
     repository: acs-edge
     # -- The tag of the Edge Agent component
-    tag: latest
+    tag: v1.0.5
   meilisearch:
     # -- The key that the manager uses to connect to the Meilisearch search engine
     key: masterKey
@@ -129,7 +137,7 @@ cmdesc:
     # -- The repository of the Commands component
     repository: acs-cmdesc
     # -- The tag of the Commands component
-    tag: latest
+    tag: v1.0.0
     # @ignore
     pullPolicy: IfNotPresent
   # -- Possible values are either 1 to enable all possible debugging, or a comma-separated list of debug tags (the tags printed before the log lines). No logging is specified as an empty string.
@@ -145,7 +153,7 @@ warehouse:
       # -- The repository of the Warehouse component
       repository: influxdb-sparkplug-ingester
       # -- The tag of the Warehouse component
-      tag: latest
+      tag: v1.0.0
       # @ignore
       pullPolicy: IfNotPresent