Bump acp version to 2.21.0 (#297)

* Bump acp version to 2.21.0 * add requestScopes for token exchange (#299) --------- Co-authored-by: Cloudentity CI <devops@cloudentity.com> Co-authored-by: Ireneusz Kawalec <ikawalec@cloudentity.com>
cloudentity · Jan 30, 2024 · 6f5d2ed · 6f5d2ed
1 parent e4aed10
commit 6f5d2ed
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -13,7 +13,7 @@ HELM_CHARTS = acp-cd,acp,istio-authorizer,kube-acp-stack
 ISTIO_VERSION ?= 1.13.3
 
 # ACP helm chart version
-ACP_VERSION ?= 2.20.0
+ACP_VERSION ?= 2.21.0
 export ACP_VERSION
 
 ### TARGETS ###

diff --git a/charts/acp-cd/Chart.yaml b/charts/acp-cd/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: acp-cd
 description: Cloudentity ACP continuous Delivery
 type: application
-version: 2.20.0
-appVersion: "2.20.0"
+version: 2.21.0
+appVersion: "2.21.0"
diff --git a/charts/acp/Chart.yaml b/charts/acp/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: acp
 description: Cloudentity Authorization Control Plane
 type: application
-version: 2.21.0-3
-appVersion: "2.20.0"
+version: 2.21.0
+appVersion: "2.21.0"
diff --git a/charts/istio-authorizer/Chart.yaml b/charts/istio-authorizer/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: istio-authorizer
 description: A Helm chart for istio-authorizer
 type: application
-version: 2.20.0
-appVersion: "2.20.0"
+version: 2.21.0
+appVersion: "2.21.0"
diff --git a/charts/istio-authorizer/templates/configmap.yaml b/charts/istio-authorizer/templates/configmap.yaml
@@ -41,6 +41,7 @@ data:
           original_token: {{ .tokenExchange.inject.headers.originalToken }}
           exchanged_token: {{ .tokenExchange.inject.headers.exchangedToken }}
           strip_bearer: {{ .tokenExchange.inject.headers.stripBearer }}
+      request_scopes: {{ .tokenExchange.requestScopes }}
     {{- end }}
   extraconfig.yaml: |
     {{- with .Values.extraConfig }}

diff --git a/charts/istio-authorizer/values.yaml b/charts/istio-authorizer/values.yaml
@@ -262,6 +262,10 @@ tokenExchange:
       ##
       stripBearer: false
 
+  # Describes what scopes should be requested for a new token
+  # One of: client | original_token
+  requestScopes: "original_token"
+
 ## ACP http client configuration
 ##
 # httpClient:

diff --git a/charts/kube-acp-stack/Chart.yaml b/charts/kube-acp-stack/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: kube-acp-stack
 description: kube-acp-stack collects acp charts combined with documentation and scripts to provide easy to operate end-to-end Kubernetes cluster
 type: application
-version: 2.21.0-3
+version: 2.21.0
 sources:
   - https://github.com/cloudentity/acp-helm-charts
 dependencies:
@@ -19,6 +19,6 @@ dependencies:
     repository: https://charts.timescale.com
     condition: timescaledb-single.enabled
   - name: acp
-    version: "2.21.0-3"
+    version: "2.21.0"
     repository: https://charts.cloudentity.io
     condition: acp.enabled