Skip to content

Commit 06afcf2

Browse files
authored
feature/fix-k8s-config-with-OIDC (#594)
<!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **Chores** - Updated tenant application version from 1.6.6 to 1.6.7 - Updated version tracking in package management system - Minor configuration adjustments in kubeconfig template - Enhanced logic for determining API server endpoint based on kubeconfig presence <!-- end of auto-generated comment: release notes by coderabbit.ai -->
1 parent 9587caa commit 06afcf2

3 files changed

Lines changed: 8 additions & 3 deletions

File tree

‎packages/apps/tenant/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ description: Separated tenant namespace
44
icon: /logos/tenant.svg
55

66
type: application
7-
version: 1.6.6
7+
version: 1.6.7

‎packages/apps/tenant/templates/kubeconfig.yaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,13 @@
44

55
{{- if $k8sClientSecret }}
66
{{- $apiServerEndpoint := index $cozyConfig.data "api-server-endpoint" }}
7+
{{- $managementKubeconfigEndpoint := default "" (get $cozyConfig.data "management-kubeconfig-endpoint") }}
8+
{{- if and $managementKubeconfigEndpoint (ne $managementKubeconfigEndpoint "") }}
9+
{{- $apiServerEndpoint = $managementKubeconfigEndpoint }}
10+
{{- end }}
711
{{- $k8sClient := index $k8sClientSecret.data "client-secret-key" | b64dec }}
812
{{- $rootSaConfigMap := lookup "v1" "ConfigMap" "kube-system" "kube-root-ca.crt" }}
9-
{{- $k8sCa := index $rootSaConfigMap.data "ca.crt" | b64enc }}
13+
{{- $k8sCa := index $rootSaConfigMap.data "ca.crt" | b64enc }}
1014
---
1115
apiVersion: v1
1216
kind: Secret

‎packages/apps/versions_map‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ tenant 1.6.2 ccedc5fe
9999
tenant 1.6.3 2057bb96
100100
tenant 1.6.4 3c9e50a4
101101
tenant 1.6.5 f1e11451
102-
tenant 1.6.6 HEAD
102+
tenant 1.6.6 d4634797
103+
tenant 1.6.7 HEAD
103104
virtual-machine 0.1.4 f2015d6
104105
virtual-machine 0.1.5 7cd7de7
105106
virtual-machine 0.2.0 5ca8823

0 commit comments

Comments
 (0)