From 922a90ac87c4a6824743a0f93e89a1c830a1aa05 Mon Sep 17 00:00:00 2001 From: petruki <31597636+petruki@users.noreply.github.com> Date: Sun, 10 Mar 2024 13:39:31 -0700 Subject: [PATCH] Added ALLOW_HOME_VIEW toggle to Switcher Management --- .github/workflows/lint-test.yaml | 6 +++--- .github/workflows/release.yml | 2 +- README.md | 1 + charts/switcher-api/Chart.yaml | 2 +- charts/switcher-api/templates/manager/configmap.yaml | 1 + charts/switcher-api/values.yaml | 1 + 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 7ef3cf1..7d9e576 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -12,11 +12,11 @@ jobs: fetch-depth: 0 - name: Set up Helm - uses: azure/setup-helm@v3 + uses: azure/setup-helm@v4.1.0 with: - version: v3.12.1 + version: v3.13.3 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: '3.10' check-latest: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2a52e9f..ba9fe1a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/README.md b/README.md index f308656..ec021ff 100644 --- a/README.md +++ b/README.md @@ -113,6 +113,7 @@ helm uninstall switcherapi --namespace switcherapi | `management.env.switcherApiUrl` | Switcher API URL | `http://localhost:3000` | | `management.env.switcherManagementUrl`| Management callback URL | `http://localhost:8080` | | `management.env.switcherSlackUrl` | Switcher Slack App URL | `http://localhost:5000` | +| `management.env.allowHomeView` | Allow Home View | false | | `management.env.googleRecaptcha` | Google ReCaptcha Public Key | `` | | `management.env.bitbucketClientId` | Bitbucket Client Id | `` | | `management.env.githubClientId` | GitHub Client Id | `` | diff --git a/charts/switcher-api/Chart.yaml b/charts/switcher-api/Chart.yaml index 86c9bb0..6615aaf 100644 --- a/charts/switcher-api/Chart.yaml +++ b/charts/switcher-api/Chart.yaml @@ -9,5 +9,5 @@ maintainers: url: https://github.com/petruki type: application -version: 1.2.0 +version: 1.2.1 appVersion: "latest" diff --git a/charts/switcher-api/templates/manager/configmap.yaml b/charts/switcher-api/templates/manager/configmap.yaml index 82704e6..e480400 100644 --- a/charts/switcher-api/templates/manager/configmap.yaml +++ b/charts/switcher-api/templates/manager/configmap.yaml @@ -6,6 +6,7 @@ metadata: labels: {{- include "switcher-management.labels" . | nindent 4 }} data: + ALLOW_HOME_VIEW: {{ .Values.management.env.allowHomeView | quote }} SWITCHERAPI_URL: {{ .Values.management.env.switcherApiUrl }} SM_IP: {{ .Values.management.env.switcherManagementUrl }} GOOGLE_RECAPTCHA: {{ .Values.management.env.googleRecaptcha }} diff --git a/charts/switcher-api/values.yaml b/charts/switcher-api/values.yaml index fc39353..fa332a3 100644 --- a/charts/switcher-api/values.yaml +++ b/charts/switcher-api/values.yaml @@ -119,6 +119,7 @@ management: portTls: 443 env: + allowHomeView: false switcherApiUrl: "http://localhost:3000" switcherManagementUrl: "http://localhost:8080" switcherSlackUrl: "http://localhost:5000"