From b83fda77110acfacb35aab260c2bff5e34c31a68 Mon Sep 17 00:00:00 2001 From: Jiefeng He Date: Mon, 22 Jul 2024 13:49:11 -0700 Subject: [PATCH] differentiate aks/eks oidc issuer name in composition samples use different suffix for aks/eks oidc issuer configmap to avoid conflict if customer is using the same name for different type of clusters --- .../compositions/samples/AttachedAKS/01-composition.yaml | 8 ++++---- .../compositions/samples/AttachedEKS/01-composition.yaml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/experiments/compositions/samples/AttachedAKS/01-composition.yaml b/experiments/compositions/samples/AttachedAKS/01-composition.yaml index 28d891b3f7..b48bfa0cd1 100644 --- a/experiments/compositions/samples/AttachedAKS/01-composition.yaml +++ b/experiments/compositions/samples/AttachedAKS/01-composition.yaml @@ -51,7 +51,7 @@ spec: version: v1 kind: ConfigMap resource: configmaps - nameSuffix: "-issuer" + nameSuffix: "-aks-issuer" fieldRef: - path: ".data.oidc" as: url @@ -102,14 +102,14 @@ spec: operatorSpec: configMaps: oidcIssuerProfile: - name: {{ attachedakses.metadata.name }}-issuer + name: {{ attachedakses.metadata.name }}-aks-issuer key: oidc secrets: adminCredentials: - name: {{ attachedakses.metadata.name }}-admin + name: {{ attachedakses.metadata.name }}-admin key: adminCredentials userCredentials: - name: {{ attachedakses.metadata.name }}-user + name: {{ attachedakses.metadata.name }}-user key: userCredentials - type: getter version: v0.0.1 diff --git a/experiments/compositions/samples/AttachedEKS/01-composition.yaml b/experiments/compositions/samples/AttachedEKS/01-composition.yaml index 6a1c5d99d8..c4dbdf35d2 100644 --- a/experiments/compositions/samples/AttachedEKS/01-composition.yaml +++ b/experiments/compositions/samples/AttachedEKS/01-composition.yaml @@ -64,7 +64,7 @@ spec: version: v1 kind: ConfigMap resource: configmaps - nameSuffix: "-issuer" + nameSuffix: "-eks-issuer" fieldRef: - path: ".data.oidc" as: url @@ -391,7 +391,7 @@ spec: apiVersion: v1 kind: ConfigMap metadata: - name: {{ attachedekses.metadata.name }}-issuer + name: {{ attachedekses.metadata.name }}-eks-issuer namespace: {{ attachedekses.metadata.namespace }} data: {} --- @@ -415,7 +415,7 @@ spec: to: key: oidc kind: configmap - name: {{ attachedekses.metadata.name }}-issuer + name: {{ attachedekses.metadata.name }}-eks-issuer namespace: {{ attachedekses.metadata.namespace }} --- - type: getter