Merge pull request #30 from ggtakec/update/k2hr3tenant

ggtakec · web-flow · commit e4ccfd80e9fc · 2025-04-18T10:44:22.000+09:00
Added dbaas.k2hr3Tenant option
diff --git a/.github/workflows/helm_template.result b/.github/workflows/helm_template.result
@@ -1010,8 +1010,8 @@ data:
     #
     # Make K2HR3 YRN for role and resource
     #
-    K2HDKC_ROLE_YRN=${K2HR3_YRN_PREFIX}${K2HDKC_NAMESPACE}:role:${K2HDKC_CLUSTER_NAME}/${K2HDKC_MODE}
-    K2HDKC_RESOURCE_YRN=${K2HR3_YRN_PREFIX}${K2HDKC_NAMESPACE}:resource:${K2HDKC_CLUSTER_NAME}/${K2HDKC_MODE}
+    K2HDKC_ROLE_YRN=${K2HR3_YRN_PREFIX}${K2HR3_TENANT}:role:${K2HDKC_CLUSTER_NAME}/${K2HDKC_MODE}
+    K2HDKC_RESOURCE_YRN=${K2HR3_YRN_PREFIX}${K2HR3_TENANT}:resource:${K2HDKC_CLUSTER_NAME}/${K2HDKC_MODE}
     
     #----------------------------------------------------------
     # Save parameters for accessing to K2HR3
diff --git a/README.md b/README.md
@@ -34,6 +34,7 @@ The following options/values are supported. See values.yaml for more detailed do
 | `dbaas.clusterName`                  | optional     | Specify a cluster name for K2HDKC, default is empty. If not set, a name is Release name(.Release.Name).                             | ""      |
 | `dbaas.startManual`                  | optional     | Specifies whether to boot the k2hdkc processes manually. This is a flag for debugging.                                              | false   |
 | `dbaas.baseDomain`                   | optional     | Specifies the base domain name for the k2hr3 cluster. The default is empty, if empty k8s.domain is used.                            | ""      |
+| `dbaas.k2hr3Tenant`                  | optional     | Specify K2HR3 tenant name for K2HDKC cluster. If empty, the namespace of kubernetes is set as default.                              | ""      |
 | `dbaas.server.count`                 | optional     | Specify the server count in K2HKDC cluster.                                                                                         | 2       |
 | `dbaas.server.port`                  | optional     | Specify the port number for K2HDKC servers.                                                                                         | 8020    |
 | `dbaas.server.ctlport`               | optional     | Specify the control port number for K2HDKC servers.                                                                                 | 8021    |
diff --git a/files/dbaas-k2hdkc-variables-setup.sh b/files/dbaas-k2hdkc-variables-setup.sh
@@ -498,8 +498,8 @@ TAG_STRING=${K2HDKC_POD_NAME}
 #
 # Make K2HR3 YRN for role and resource
 #
-K2HDKC_ROLE_YRN=${K2HR3_YRN_PREFIX}${K2HDKC_NAMESPACE}:role:${K2HDKC_CLUSTER_NAME}/${K2HDKC_MODE}
-K2HDKC_RESOURCE_YRN=${K2HR3_YRN_PREFIX}${K2HDKC_NAMESPACE}:resource:${K2HDKC_CLUSTER_NAME}/${K2HDKC_MODE}
+K2HDKC_ROLE_YRN=${K2HR3_YRN_PREFIX}${K2HR3_TENANT}:role:${K2HDKC_CLUSTER_NAME}/${K2HDKC_MODE}
+K2HDKC_RESOURCE_YRN=${K2HR3_YRN_PREFIX}${K2HR3_TENANT}:resource:${K2HDKC_CLUSTER_NAME}/${K2HDKC_MODE}
 
 #----------------------------------------------------------
 # Save parameters for accessing to K2HR3
diff --git a/questions.yaml b/questions.yaml
@@ -52,6 +52,16 @@ questions:
   min_length: 0
   max_length: 1023
 
+- variable: dbaas.k2hr3Tenant
+  default: ""
+  label: "K2HR3 Tenant name for K2HDKC cluster"
+  description: "Specify K2HR3 tenant name for K2HDKC cluster. You can specify this if using custom OIDC and a tenant name outside the kubernets namespace. If empty, the namespace of kubernetes is set as default."
+  type: string
+  required: true
+  group: "K2HR3 System to use"
+  min_length: 0
+  max_length: 1023
+
 #
 # K2HDKC Server
 #
diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
@@ -83,6 +83,16 @@
 	{{- printf "%s" $tmpname }}
 {{- end }}
 
+{{-
+/*---------------------------------------------------------
+* Set k2hr3 tenant name for dbaas.
+*
+*/}}
+{{- define "k2hdkc.k2hr3Tenant" -}}
+	{{- $tmpname := default (include "k2hdkc.k8sNamespace" .) .Values.dbaas.k2hr3Tenant }}
+	{{- printf "%s" $tmpname }}
+{{- end }}
+
 {{-
 /*---------------------------------------------------------
 * Set base domain(fqdn) for dbaas.
diff --git a/templates/dbaas-k2hdkc-server.yaml b/templates/dbaas-k2hdkc-server.yaml
@@ -158,7 +158,7 @@ spec:
             - name: K2HR3_API_URL
               value: "https://{{ include "k2hdkc.r3apiIntSvcFullname" . }}:{{ include "k2hdkc.r3apiIntPort" . }}"
             - name: K2HR3_TENANT
-              value: "{{ include "k2hdkc.k8sNamespace" . }}"
+              value: "{{ include "k2hdkc.k2hr3Tenant" . }}"
             - name: K2HDKC_DOMAIN
               value: "{{ include "k2hdkc.dbaasBaseDomain" . }}"
             - name: K2HDKC_CLUSTER_NAME
diff --git a/templates/dbaas-k2hdkc-setup-k2hr3.yaml b/templates/dbaas-k2hdkc-setup-k2hr3.yaml
@@ -83,7 +83,7 @@ spec:
           - name: K2HR3_API_URL
             value: "https://{{ include "k2hdkc.r3apiIntSvcFullname" . }}:{{ include "k2hdkc.r3apiIntPort" . }}"
           - name: K2HR3_TENANT
-            value: "{{ include "k2hdkc.k8sNamespace" . }}"
+            value: "{{ include "k2hdkc.k2hr3Tenant" . }}"
           - name: SEC_CA_MOUNTPOINT
             value: "{{ .Values.mountPoint.ca }}"
           - name: SEC_K2HR3_TOKEN_MOUNTPOINT
diff --git a/templates/dbaas-k2hdkc-slave.yaml b/templates/dbaas-k2hdkc-slave.yaml
@@ -165,7 +165,7 @@ spec:
             - name: K2HR3_API_URL
               value: "https://{{ include "k2hdkc.r3apiIntSvcFullname" . }}:{{ include "k2hdkc.r3apiIntPort" . }}"
             - name: K2HR3_TENANT
-              value: "{{ include "k2hdkc.k8sNamespace" . }}"
+              value: "{{ include "k2hdkc.k2hr3Tenant" . }}"
             - name: K2HDKC_DOMAIN
               value: "{{ include "k2hdkc.dbaasBaseDomain" . }}"
             - name: K2HDKC_CLUSTER_NAME
diff --git a/templates/dbaas-k2hdkc-unsetup-k2hr3.yaml b/templates/dbaas-k2hdkc-unsetup-k2hr3.yaml
@@ -79,7 +79,7 @@ spec:
           - name: K2HR3_API_URL
             value: "https://{{ include "k2hdkc.r3apiIntSvcFullname" . }}:{{ include "k2hdkc.r3apiIntPort" . }}"
           - name: K2HR3_TENANT
-            value: "{{ include "k2hdkc.k8sNamespace" . }}"
+            value: "{{ include "k2hdkc.k2hr3Tenant" . }}"
           - name: SEC_CA_MOUNTPOINT
             value: "{{ .Values.mountPoint.ca }}"
           - name: SEC_K2HR3_TOKEN_MOUNTPOINT
diff --git a/templates/tests/dbaas-k2hdkc-check.yaml b/templates/tests/dbaas-k2hdkc-check.yaml
@@ -84,7 +84,7 @@ spec:
         - name: K2HR3_API_URL
           value: "https://{{ include "k2hdkc.r3apiIntSvcFullname" . }}:{{ include "k2hdkc.r3apiIntPort" . }}"
         - name: K2HR3_TENANT
-          value: "{{ include "k2hdkc.k8sNamespace" . }}"
+          value: "{{ include "k2hdkc.k2hr3Tenant" . }}"
         - name: K2HDKC_DOMAIN
           value: "{{ include "k2hdkc.dbaasBaseDomain" . }}"
         - name: K2HDKC_CLUSTER_NAME
diff --git a/values.schema.json b/values.schema.json
@@ -74,6 +74,10 @@
           "description": "[optional] Specifies the base domain name for the k2hr3 cluster. The default is empty, if empty k8s.domain is used.",
           "type": "string"
         },
+        "k2hr3Tenant": {
+          "description": "[optional] Specify k2hr3 tenant name for k2hdkc cluster. If empty, the namespace of kubernetes is set as default.",
+          "type": "string"
+        },
 
         "server": {
           "description": "[optional] The setting for the servers of the K2HDKC cluster.",
diff --git a/values.yaml b/values.yaml
@@ -62,6 +62,9 @@ antpickax:
 #	baseDomain			Specify the domain name of kubernetes. This
 #						value is usually empty. If empty, k8s.domain
 #						will be used.
+#	k2hr3Tenant			Specify k2hr3 tenant name for k2hdkc cluster.
+#						If empty, the namespace of kubernetes is set as
+#                   	default.
 #	server.count		Specifies the number of k2hdkc servers.
 #	server.port			Specifies the port number of k2hdkc servers.
 #	server.ctlport		Specifies the control port number of k2hdkc
@@ -100,6 +103,7 @@ dbaas:
   clusterName: ""
   startManual: false
   baseDomain: ""
+  k2hr3Tenant: ""
   server:
     count: 2
     port: 8020

Original file line number	Diff line number	Diff line change
`@@ -1010,8 +1010,8 @@ data:`
`1010`	`1010`	`#`
`1011`	`1011`	`# Make K2HR3 YRN for role and resource`
`1012`	`1012`	`#`
`1013`		`- K2HDKC_ROLE_YRN=${K2HR3_YRN_PREFIX}${K2HDKC_NAMESPACE}:role:${K2HDKC_CLUSTER_NAME}/${K2HDKC_MODE}`
`1014`		`- K2HDKC_RESOURCE_YRN=${K2HR3_YRN_PREFIX}${K2HDKC_NAMESPACE}:resource:${K2HDKC_CLUSTER_NAME}/${K2HDKC_MODE}`
	`1013`	`+ K2HDKC_ROLE_YRN=${K2HR3_YRN_PREFIX}${K2HR3_TENANT}:role:${K2HDKC_CLUSTER_NAME}/${K2HDKC_MODE}`
	`1014`	`+ K2HDKC_RESOURCE_YRN=${K2HR3_YRN_PREFIX}${K2HR3_TENANT}:resource:${K2HDKC_CLUSTER_NAME}/${K2HDKC_MODE}`
`1015`	`1015`
`1016`	`1016`	`#----------------------------------------------------------`
`1017`	`1017`	`# Save parameters for accessing to K2HR3`
Original file line number	Diff line number	Diff line change
`@@ -498,8 +498,8 @@ TAG_STRING=${K2HDKC_POD_NAME}`
`498`	`498`	`#`
`499`	`499`	`# Make K2HR3 YRN for role and resource`
`500`	`500`	`#`
`501`		`-K2HDKC_ROLE_YRN=${K2HR3_YRN_PREFIX}${K2HDKC_NAMESPACE}:role:${K2HDKC_CLUSTER_NAME}/${K2HDKC_MODE}`
`502`		`-K2HDKC_RESOURCE_YRN=${K2HR3_YRN_PREFIX}${K2HDKC_NAMESPACE}:resource:${K2HDKC_CLUSTER_NAME}/${K2HDKC_MODE}`
	`501`	`+K2HDKC_ROLE_YRN=${K2HR3_YRN_PREFIX}${K2HR3_TENANT}:role:${K2HDKC_CLUSTER_NAME}/${K2HDKC_MODE}`
	`502`	`+K2HDKC_RESOURCE_YRN=${K2HR3_YRN_PREFIX}${K2HR3_TENANT}:resource:${K2HDKC_CLUSTER_NAME}/${K2HDKC_MODE}`
`503`	`503`
`504`	`504`	`#----------------------------------------------------------`
`505`	`505`	`# Save parameters for accessing to K2HR3`