This is an automated email from the ASF dual-hosted git repository.
zhongxjian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-kubernetes.git
The following commit(s) were added to refs/heads/master by this push:
new aee30920 [charts] Initial obs yaml config (#458)
aee30920 is described below
commit aee30920e4c7cdf4105527242a4e1393bed63a83
Author: mfordjody <[email protected]>
AuthorDate: Mon Oct 14 13:13:08 2024 +0800
[charts] Initial obs yaml config (#458)
---
.../templates/{custom => modular}/_apiversions.tpl | 0
.../templates/{custom => modular}/_extras.tpl | 0
.../templates/{custom => modular}/_ingresses.tpl | 0
.../templates/{custom => modular}/_labels.tpl | 0
.../templates/{custom => modular}/_matches.tpl | 0
.../admin/templates/{custom => modular}/_names.tpl | 0
.../templates/{custom => modular}/_namespaces.tpl | 0
.../templates/{custom => modular}/_selectors.tpl | 0
.../templates/{custom => modular}/_services.tpl | 0
.../jobs/jobs-scripts.yaml} | 0
.../observable/exporters/servicemonitor.yaml | 14 ++++++++++
.../observable/grafana-resources-app-metrics.yaml | 14 ++++++++++
.../observable/grafana-resources-app-traces.yaml | 14 ++++++++++
.../observable/grafana-resources-ins-metrics.yaml | 14 ++++++++++
.../observable/grafana-resources-ins-traces.yaml | 14 ++++++++++
.../observable/grafana-resources-svc-metrics.yaml | 14 ++++++++++
.../observable/grafana-resources-svc-traces.yaml | 14 ++++++++++
.../admin/templates/traffic/traffic-authority.yaml | 31 ----------------------
.../{traffic-rules.yaml => traffic-config.yaml} | 0
.../admin/templates/traffic/traffic-rbac.yaml | 30 +++++++++++++++++++++
20 files changed, 128 insertions(+), 31 deletions(-)
diff --git a/manifests/charts/admin/templates/custom/_apiversions.tpl
b/manifests/charts/admin/templates/modular/_apiversions.tpl
similarity index 100%
rename from manifests/charts/admin/templates/custom/_apiversions.tpl
rename to manifests/charts/admin/templates/modular/_apiversions.tpl
diff --git a/manifests/charts/admin/templates/custom/_extras.tpl
b/manifests/charts/admin/templates/modular/_extras.tpl
similarity index 100%
rename from manifests/charts/admin/templates/custom/_extras.tpl
rename to manifests/charts/admin/templates/modular/_extras.tpl
diff --git a/manifests/charts/admin/templates/custom/_ingresses.tpl
b/manifests/charts/admin/templates/modular/_ingresses.tpl
similarity index 100%
rename from manifests/charts/admin/templates/custom/_ingresses.tpl
rename to manifests/charts/admin/templates/modular/_ingresses.tpl
diff --git a/manifests/charts/admin/templates/custom/_labels.tpl
b/manifests/charts/admin/templates/modular/_labels.tpl
similarity index 100%
rename from manifests/charts/admin/templates/custom/_labels.tpl
rename to manifests/charts/admin/templates/modular/_labels.tpl
diff --git a/manifests/charts/admin/templates/custom/_matches.tpl
b/manifests/charts/admin/templates/modular/_matches.tpl
similarity index 100%
rename from manifests/charts/admin/templates/custom/_matches.tpl
rename to manifests/charts/admin/templates/modular/_matches.tpl
diff --git a/manifests/charts/admin/templates/custom/_names.tpl
b/manifests/charts/admin/templates/modular/_names.tpl
similarity index 100%
rename from manifests/charts/admin/templates/custom/_names.tpl
rename to manifests/charts/admin/templates/modular/_names.tpl
diff --git a/manifests/charts/admin/templates/custom/_namespaces.tpl
b/manifests/charts/admin/templates/modular/_namespaces.tpl
similarity index 100%
rename from manifests/charts/admin/templates/custom/_namespaces.tpl
rename to manifests/charts/admin/templates/modular/_namespaces.tpl
diff --git a/manifests/charts/admin/templates/custom/_selectors.tpl
b/manifests/charts/admin/templates/modular/_selectors.tpl
similarity index 100%
rename from manifests/charts/admin/templates/custom/_selectors.tpl
rename to manifests/charts/admin/templates/modular/_selectors.tpl
diff --git a/manifests/charts/admin/templates/custom/_services.tpl
b/manifests/charts/admin/templates/modular/_services.tpl
similarity index 100%
rename from manifests/charts/admin/templates/custom/_services.tpl
rename to manifests/charts/admin/templates/modular/_services.tpl
diff --git a/manifests/charts/admin/templates/custom/job/job-scripts.yaml
b/manifests/charts/admin/templates/modular/jobs/jobs-scripts.yaml
similarity index 100%
rename from manifests/charts/admin/templates/custom/job/job-scripts.yaml
rename to manifests/charts/admin/templates/modular/jobs/jobs-scripts.yaml
diff --git
a/manifests/charts/admin/templates/observable/exporters/servicemonitor.yaml
b/manifests/charts/admin/templates/observable/exporters/servicemonitor.yaml
new file mode 100644
index 00000000..1768a1b7
--- /dev/null
+++ b/manifests/charts/admin/templates/observable/exporters/servicemonitor.yaml
@@ -0,0 +1,14 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+ # limitations under the License.
diff --git
a/manifests/charts/admin/templates/observable/grafana-resources-app-metrics.yaml
b/manifests/charts/admin/templates/observable/grafana-resources-app-metrics.yaml
new file mode 100644
index 00000000..1768a1b7
--- /dev/null
+++
b/manifests/charts/admin/templates/observable/grafana-resources-app-metrics.yaml
@@ -0,0 +1,14 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+ # limitations under the License.
diff --git
a/manifests/charts/admin/templates/observable/grafana-resources-app-traces.yaml
b/manifests/charts/admin/templates/observable/grafana-resources-app-traces.yaml
new file mode 100644
index 00000000..1768a1b7
--- /dev/null
+++
b/manifests/charts/admin/templates/observable/grafana-resources-app-traces.yaml
@@ -0,0 +1,14 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+ # limitations under the License.
diff --git
a/manifests/charts/admin/templates/observable/grafana-resources-ins-metrics.yaml
b/manifests/charts/admin/templates/observable/grafana-resources-ins-metrics.yaml
new file mode 100644
index 00000000..1768a1b7
--- /dev/null
+++
b/manifests/charts/admin/templates/observable/grafana-resources-ins-metrics.yaml
@@ -0,0 +1,14 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+ # limitations under the License.
diff --git
a/manifests/charts/admin/templates/observable/grafana-resources-ins-traces.yaml
b/manifests/charts/admin/templates/observable/grafana-resources-ins-traces.yaml
new file mode 100644
index 00000000..1768a1b7
--- /dev/null
+++
b/manifests/charts/admin/templates/observable/grafana-resources-ins-traces.yaml
@@ -0,0 +1,14 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+ # limitations under the License.
diff --git
a/manifests/charts/admin/templates/observable/grafana-resources-svc-metrics.yaml
b/manifests/charts/admin/templates/observable/grafana-resources-svc-metrics.yaml
new file mode 100644
index 00000000..1768a1b7
--- /dev/null
+++
b/manifests/charts/admin/templates/observable/grafana-resources-svc-metrics.yaml
@@ -0,0 +1,14 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+ # limitations under the License.
diff --git
a/manifests/charts/admin/templates/observable/grafana-resources-svc-traces.yaml
b/manifests/charts/admin/templates/observable/grafana-resources-svc-traces.yaml
new file mode 100644
index 00000000..1768a1b7
--- /dev/null
+++
b/manifests/charts/admin/templates/observable/grafana-resources-svc-traces.yaml
@@ -0,0 +1,14 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+ # limitations under the License.
diff --git a/manifests/charts/admin/templates/traffic/traffic-authority.yaml
b/manifests/charts/admin/templates/traffic/traffic-authority.yaml
index 42a85117..83f6bb25 100644
--- a/manifests/charts/admin/templates/traffic/traffic-authority.yaml
+++ b/manifests/charts/admin/templates/traffic/traffic-authority.yaml
@@ -1,36 +1,5 @@
{{- $auth := .Values.auth -}}{{- $authz := $auth.authorization -}}{{- $authc
:= $auth.authentication -}}
{{- if $auth.enabled }}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
- name: {{ template "cp.name" . }}-sa
- namespace: {{ template "system.namespaces" . }}
----
-apiVersion: {{ include "rbac.apiVersion" . }}
-kind: ClusterRole
-metadata:
- name: {{ include "cp.name" . }}-clusterrole
-rules:
-- apiGroups:
- - ""
- resources:
- - namespaces
- verbs:
- - get
----
-apiVersion: {{ include "rbac.apiVersion" . }}
-kind: ClusterRoleBinding
-metadata:
- name: {{ include "cp.name" . }}-clusterrolebinding
-roleRef:
- apiGroup: rbac.authorization.k8s.io
- kind: ClusterRole
- name: {{ include "cp.name" . }}-clusterrole
-subjects:
- - kind: ServiceAccount
- name: {{ template "cp.name" . }}-sa
- namespace: {{ template "system.namespaces" . }}
----
apiVersion: dubbo.io/v1alpha1
kind: AuthenticationPolicy
metadata:
diff --git a/manifests/charts/admin/templates/traffic/traffic-rules.yaml
b/manifests/charts/admin/templates/traffic/traffic-config.yaml
similarity index 100%
rename from manifests/charts/admin/templates/traffic/traffic-rules.yaml
rename to manifests/charts/admin/templates/traffic/traffic-config.yaml
diff --git a/manifests/charts/admin/templates/traffic/traffic-rbac.yaml
b/manifests/charts/admin/templates/traffic/traffic-rbac.yaml
new file mode 100644
index 00000000..0f29ff8b
--- /dev/null
+++ b/manifests/charts/admin/templates/traffic/traffic-rbac.yaml
@@ -0,0 +1,30 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+ name: {{ template "cp.name" . }}-sa
+ namespace: {{ template "system.namespaces" . }}
+---
+apiVersion: {{ include "rbac.apiVersion" . }}
+kind: ClusterRole
+metadata:
+ name: {{ include "cp.name" . }}-clusterrole
+rules:
+ - apiGroups:
+ - ""
+ resources:
+ - namespaces
+ verbs:
+ - get
+---
+apiVersion: {{ include "rbac.apiVersion" . }}
+kind: ClusterRoleBinding
+metadata:
+ name: {{ include "cp.name" . }}-clusterrolebinding
+roleRef:
+ apiGroup: rbac.authorization.k8s.io
+ kind: ClusterRole
+ name: {{ include "cp.name" . }}-clusterrole
+subjects:
+ - kind: ServiceAccount
+ name: {{ template "cp.name" . }}-sa
+ namespace: {{ template "system.namespaces" . }}
\ No newline at end of file
