(dubbo-admin) branch develop updated: Fix missing apiserver module (#1229)

[liujun]

This is an automated email from the ASF dual-hosted git repository.

liujun pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/dubbo-admin.git


The following commit(s) were added to refs/heads/develop by this push:
     new ffc2b9ae Fix missing apiserver module (#1229)
ffc2b9ae is described below

commit ffc2b9ae144359ca11576bd85bb0e2820f8edf53
Author: Jian Zhong <11638...@qq.com>
AuthorDate: Thu Nov 30 18:12:14 2023 +0800

    Fix missing apiserver module (#1229)
    
    release 0.6.0
---
 .../charts/dubbo-admin/templates/_helpers.tpl            | 16 ++++++++++++++++
 .../charts/dubbo-admin/templates/rolebinding.yaml        |  2 +-
 charts/admin-stack/charts/dubbo-admin/values.yaml        |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/charts/admin-stack/charts/dubbo-admin/templates/_helpers.tpl 
b/charts/admin-stack/charts/dubbo-admin/templates/_helpers.tpl
index b7ea4c9e..538e61c9 100644
--- a/charts/admin-stack/charts/dubbo-admin/templates/_helpers.tpl
+++ b/charts/admin-stack/charts/dubbo-admin/templates/_helpers.tpl
@@ -84,4 +84,20 @@ Create the name of the service account to use
 {{- else }}
 {{- default "default" .Values.serviceAccount.nameTest }}
 {{- end }}
+{{- end }}
+
+{{- define "dubbo-admin.rbac.apiVersion" -}}
+{{- if $.Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1" }}
+{{- print "rbac.authorization.k8s.io/v1" }}
+{{- else }}
+{{- print "rbac.authorization.k8s.io/v1beta1" }}
+{{- end }}
+{{- end }}
+
+{{- define "dubbo-admin.podDisruptionBudget.apiVersion" -}}
+{{- if $.Capabilities.APIVersions.Has "policy/v1/PodDisruptionBudget" }}
+{{- print "policy/v1" }}
+{{- else }}
+{{- print "policy/v1beta1" }}
+{{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/charts/admin-stack/charts/dubbo-admin/templates/rolebinding.yaml 
b/charts/admin-stack/charts/dubbo-admin/templates/rolebinding.yaml
index ecf0b94a..357f9352 100644
--- a/charts/admin-stack/charts/dubbo-admin/templates/rolebinding.yaml
+++ b/charts/admin-stack/charts/dubbo-admin/templates/rolebinding.yaml
@@ -17,8 +17,8 @@ roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
   name: {{ include "dubbo-admin.fullname" . }}
-  {{- end }}
 subjects:
   - kind: ServiceAccount
     name: {{ include "dubbo-admin.serviceAccountName" . }}
     namespace: {{ include "dubbo-admin.namespace" . }}
+{{- end }}
diff --git a/charts/admin-stack/charts/dubbo-admin/values.yaml 
b/charts/admin-stack/charts/dubbo-admin/values.yaml
index 557d2218..cf9ff5e1 100644
--- a/charts/admin-stack/charts/dubbo-admin/values.yaml
+++ b/charts/admin-stack/charts/dubbo-admin/values.yaml
@@ -5,7 +5,7 @@ image:
   repository: apache/dubbo-admin
   ##
   ##
-  tag: "0.5.0"
+  tag: "0.6.0"
   ##
   ##
   debug: false