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 778298fe [dubboctl] update charts and operator v2 (#675)
778298fe is described below
commit 778298fedfe00d39374bca6bcfb0c8417b81ee44
Author: Jian Zhong <[email protected]>
AuthorDate: Thu Apr 10 08:21:55 2025 +0800
[dubboctl] update charts and operator v2 (#675)
---
dubboctl/cmd/create.go | 17 +--
dubboctl/cmd/image.go | 19 ++--
dubboctl/cmd/root.go | 4 +-
dubboctl/pkg/hub/builder/pack/build.go | 4 +-
dubboctl/pkg/hub/deployer/deploy.tpl | 10 --
dubboctl/pkg/hub/pusher/pusher.go | 17 ++-
.../charts/admin/charts/kube-prometheus/Chart.yaml | 15 +++
.../charts/kube-prometheus/charts/crds/Chart.yaml | 15 +++
.../charts/crds/crds/crd-alertmanagerconfigs.yaml | 15 +++
.../charts/crds/crds/crd-alertmanagers.yaml | 15 +++
.../charts/crds/crds/crd-podmonitors.yaml | 15 +++
.../charts/crds/crds/crd-probes.yaml | 15 +++
.../charts/crds/crds/crd-prometheusagents.yaml | 15 +++
.../charts/crds/crds/crd-prometheuses.yaml | 15 +++
.../charts/crds/crds/crd-prometheusrules.yaml | 15 +++
.../charts/crds/crds/crd-scrapeconfigs.yaml | 15 +++
.../charts/crds/crds/crd-servicemonitors.yaml | 15 +++
.../charts/crds/crds/crd-thanosrulers.yaml | 15 +++
.../charts/kube-prometheus/charts/crds/values.yaml | 15 +++
.../charts/grafana/ci/default-values.yaml | 15 +++
.../charts/grafana/ci/with-affinity-values.yaml | 15 +++
.../grafana/ci/with-dashboard-json-values.yaml | 15 +++
.../charts/grafana/ci/with-dashboard-values.yaml | 15 +++
.../ci/with-extraconfigmapmounts-values.yaml | 15 +++
.../grafana/ci/with-image-renderer-values.yaml | 15 +++
.../charts/grafana/ci/with-nondefault-values.yaml | 15 +++
.../charts/grafana/ci/with-persistence.yaml | 15 +++
.../ci/with-sidecars-envvaluefrom-values.yaml | 15 +++
.../kube-prometheus/charts/grafana/values.yaml | 15 +++
.../charts/kube-state-metrics/Chart.yaml | 15 +++
.../charts/kube-state-metrics/values.yaml | 15 +++
.../charts/prometheus-node-exporter/Chart.yaml | 15 +++
.../charts/prometheus-node-exporter/values.yaml | 15 +++
.../admin/charts/kube-prometheus/values.yaml | 15 +++
manifests/charts/admin/values.yaml | 14 +--
manifests/charts/base/templates/jobs.yaml | 120 +++++++++++++++------
36 files changed, 547 insertions(+), 78 deletions(-)
diff --git a/dubboctl/cmd/create.go b/dubboctl/cmd/create.go
index c18e8c54..4eed2af7 100644
--- a/dubboctl/cmd/create.go
+++ b/dubboctl/cmd/create.go
@@ -33,8 +33,9 @@ import (
type createArgs struct {
// dirname specifies the name of the custom-created directory.
dirname string
- // language specifies different SDK languages.
+ // language specifies different sdk languages.
language string
+ // template specifies repository or default common.
template string
}
@@ -102,12 +103,16 @@ func sdkGenerateCmd(cmd *cobra.Command, clientFactory
ClientFactory) *cobra.Comm
type createConfig struct {
// Path Absolute to function source
- Path string
- Runtime string
+ Path string
+ // Runtime
+ Runtime string
+ // Template
Template string
- // Repo URI (overrides builtin and installed)
- Repo string
- DirName string
+ // Repo Uri (overrides builtin and installed)
+ Repo string
+ // DirName Defines a custom creation directory name。
+ DirName string
+ // Initialized
Initialized bool
}
diff --git a/dubboctl/cmd/image.go b/dubboctl/cmd/image.go
index e305b9f3..4b5b2320 100644
--- a/dubboctl/cmd/image.go
+++ b/dubboctl/cmd/image.go
@@ -35,10 +35,14 @@ import (
)
type imageArgs struct {
+ // dockerfile Defines the required Dockerfile files.
dockerfile bool
- builder bool
- output string
- destroy bool
+ // builder Defines the path used by the builder.
+ builder bool
+ // output Defines the generated dubbo deploy yaml file.
+ output string
+ // destroy Defines the deletion of deploy yaml file.
+ destroy bool
}
func addHubFlags(cmd *cobra.Command, iArgs *imageArgs) {
@@ -48,7 +52,7 @@ func addHubFlags(cmd *cobra.Command, iArgs *imageArgs) {
func addDeployFlags(cmd *cobra.Command, iArgs *imageArgs) {
cmd.PersistentFlags().StringVarP(&iArgs.output, "output", "o",
"dubbo-deploy.yaml", "The output generates k8s yaml file")
- cmd.PersistentFlags().BoolVarP(&iArgs.destroy, "delete", "d", false,
"delete k8s yaml file")
+ cmd.PersistentFlags().BoolVarP(&iArgs.destroy, "delete", "d", false,
"deletion k8s yaml file")
}
func ImageCmd(ctx cli.Context, cmd *cobra.Command, clientFactory
ClientFactory) *cobra.Command {
@@ -64,9 +68,12 @@ func ImageCmd(ctx cli.Context, cmd *cobra.Command,
clientFactory ClientFactory)
}
type hubConfig struct {
+ // Dockerfile Defines the required files.
Dockerfile bool
- Builder bool
- Image string
+ // Builder Defines the path used by the builder.
+ Builder bool
+ // Image information required by image.
+ Image string
// BuilderImage is the image (name or mapping) to use for building.
Usually
// set automatically.
BuilderImage string
diff --git a/dubboctl/cmd/root.go b/dubboctl/cmd/root.go
index e83f1c0e..94b80cb1 100644
--- a/dubboctl/cmd/root.go
+++ b/dubboctl/cmd/root.go
@@ -48,7 +48,7 @@ func NewClientFactory(options ...sdk.Option) (*sdk.Client,
func()) {
var (
t = newTransport(false)
c = newCredentialsProvider(util.Dir(), t)
- d = newDubboDeployer()
+ d = newDeployer()
o = []sdk.Option{
sdk.WithRepositoriesPath(util.RepositoriesPath()),
sdk.WithBuilder(pack.NewBuilder()),
@@ -77,7 +77,7 @@ func newCredentialsProvider(configPath string, t
http.RoundTripper) pusher.Crede
return credentials.NewCredentialsProvider(configPath, options...)
}
-func newDubboDeployer() sdk.Deployer {
+func newDeployer() sdk.Deployer {
var options []deployer.DeployerOption
return deployer.NewDeployer(options...)
diff --git a/dubboctl/pkg/hub/builder/pack/build.go
b/dubboctl/pkg/hub/builder/pack/build.go
index fda280af..04d938bb 100644
--- a/dubboctl/pkg/hub/builder/pack/build.go
+++ b/dubboctl/pkg/hub/builder/pack/build.go
@@ -52,7 +52,7 @@ var (
type Builder struct {
name string
- outBuff bytes.Buffer
+ outBuffer bytes.Buffer
logger logging.Logger
impl Impl
withTimestamp bool
@@ -136,7 +136,7 @@ func (b *Builder) Build(ctx context.Context, dc
*dubbo.DubboConfig) (err error)
} else {
err = fmt.Errorf("failed to build the application: %w",
err)
fmt.Fprintln(color.Stderr(), "")
- _, _ = io.Copy(color.Stderr(), &b.outBuff)
+ _, _ = io.Copy(color.Stderr(), &b.outBuffer)
fmt.Fprintln(color.Stderr(), "")
}
}
diff --git a/dubboctl/pkg/hub/deployer/deploy.tpl
b/dubboctl/pkg/hub/deployer/deploy.tpl
index 4c2eff39..6f44d344 100644
--- a/dubboctl/pkg/hub/deployer/deploy.tpl
+++ b/dubboctl/pkg/hub/deployer/deploy.tpl
@@ -21,16 +21,6 @@ spec:
ports:
- containerPort: {{.Port}}
name: dubbo
- readinessProbe:
- tcpSocket:
- port: {{.Port}}
- initialDelaySeconds: 5
- periodSeconds: 10
- livenessProbe:
- tcpSocket:
- port: {{.Port}}
- initialDelaySeconds: 15
- periodSeconds: 20
resources:
requests:
cpu: 100m
diff --git a/dubboctl/pkg/hub/pusher/pusher.go
b/dubboctl/pkg/hub/pusher/pusher.go
index fa1f3540..0c54ef93 100644
--- a/dubboctl/pkg/hub/pusher/pusher.go
+++ b/dubboctl/pkg/hub/pusher/pusher.go
@@ -51,29 +51,24 @@ type Credentials struct {
type CredentialsProvider func(ctx context.Context, image string) (Credentials,
error)
-type PusherDockerClientFactory func() (PusherDockerClient, error)
+type DockerClientFactory func() (DockerClient, error)
type Pusher struct {
credentialsProvider CredentialsProvider
transport http.RoundTripper
- dockerClientFactory PusherDockerClientFactory
+ dockerClientFactory DockerClientFactory
}
type authConfig struct {
- Username string `json:"username,omitempty"`
- Password string `json:"password,omitempty"`
- Auth string `json:"auth,omitempty"`
- Email string `json:"email,omitempty"`
- ServerAddress string `json:"serveraddress,omitempty"`
- IdentityToken string `json:"identitytoken,omitempty"`
- RegistryToken string `json:"registrytoken,omitempty"`
+ Username string `json:"username,omitempty"`
+ Password string `json:"password,omitempty"`
}
func NewPusher(opts ...Opt) *Pusher {
result := &Pusher{
credentialsProvider: EmptyCredentialsProvider,
transport: http.DefaultTransport,
- dockerClientFactory: func() (PusherDockerClient, error) {
+ dockerClientFactory: func() (DockerClient, error) {
c, _, err := hub.NewClient(client.DefaultDockerHost)
return c, err
},
@@ -236,7 +231,7 @@ func (n *Pusher) push(ctx context.Context, dc
*dubbo.DubboConfig, credentials Cr
return hash.String(), nil
}
-type PusherDockerClient interface {
+type DockerClient interface {
daemon.Client
ImagePush(ctx context.Context, ref string, options
types.ImagePushOptions) (io.ReadCloser, error)
Close() error
diff --git a/manifests/charts/admin/charts/kube-prometheus/Chart.yaml
b/manifests/charts/admin/charts/kube-prometheus/Chart.yaml
index 634f1509..a7d49d1b 100644
--- a/manifests/charts/admin/charts/kube-prometheus/Chart.yaml
+++ b/manifests/charts/admin/charts/kube-prometheus/Chart.yaml
@@ -1,3 +1,18 @@
+# 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.
+
annotations:
artifacthub.io/license: Apache-2.0
artifacthub.io/links: |
diff --git
a/manifests/charts/admin/charts/kube-prometheus/charts/crds/Chart.yaml
b/manifests/charts/admin/charts/kube-prometheus/charts/crds/Chart.yaml
index adb9e4a5..9b563e62 100644
--- a/manifests/charts/admin/charts/kube-prometheus/charts/crds/Chart.yaml
+++ b/manifests/charts/admin/charts/kube-prometheus/charts/crds/Chart.yaml
@@ -1,3 +1,18 @@
+# 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.
+
apiVersion: v2
name: crds
version: 0.0.0
diff --git
a/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-alertmanagerconfigs.yaml
b/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-alertmanagerconfigs.yaml
index 957961d1..0fda9ddd 100644
---
a/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-alertmanagerconfigs.yaml
+++
b/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-alertmanagerconfigs.yaml
@@ -1,3 +1,18 @@
+# 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.
+
#
https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.81.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
---
apiVersion: apiextensions.k8s.io/v1
diff --git
a/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-alertmanagers.yaml
b/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-alertmanagers.yaml
index 607211cf..546edefe 100644
---
a/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-alertmanagers.yaml
+++
b/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-alertmanagers.yaml
@@ -1,3 +1,18 @@
+# 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.
+
#
https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.81.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
---
apiVersion: apiextensions.k8s.io/v1
diff --git
a/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-podmonitors.yaml
b/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-podmonitors.yaml
index 1a44bf8e..9eec9070 100644
---
a/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-podmonitors.yaml
+++
b/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-podmonitors.yaml
@@ -1,3 +1,18 @@
+# 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.
+
#
https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.81.0/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
---
apiVersion: apiextensions.k8s.io/v1
diff --git
a/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-probes.yaml
b/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-probes.yaml
index 98b824d3..894b9aa4 100644
---
a/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-probes.yaml
+++
b/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-probes.yaml
@@ -1,3 +1,18 @@
+# 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.
+
#
https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.81.0/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
---
apiVersion: apiextensions.k8s.io/v1
diff --git
a/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-prometheusagents.yaml
b/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-prometheusagents.yaml
index d3b87423..46c4cab2 100644
---
a/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-prometheusagents.yaml
+++
b/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-prometheusagents.yaml
@@ -1,3 +1,18 @@
+# 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.
+
#
https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.81.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
---
apiVersion: apiextensions.k8s.io/v1
diff --git
a/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-prometheuses.yaml
b/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-prometheuses.yaml
index 3e7aa439..4c63896a 100644
---
a/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-prometheuses.yaml
+++
b/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-prometheuses.yaml
@@ -1,3 +1,18 @@
+# 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.
+
#
https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.81.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
---
apiVersion: apiextensions.k8s.io/v1
diff --git
a/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-prometheusrules.yaml
b/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-prometheusrules.yaml
index 2d5b1d4a..97e06377 100644
---
a/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-prometheusrules.yaml
+++
b/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-prometheusrules.yaml
@@ -1,3 +1,18 @@
+# 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.
+
#
https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.81.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
---
apiVersion: apiextensions.k8s.io/v1
diff --git
a/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-scrapeconfigs.yaml
b/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-scrapeconfigs.yaml
index 985c806e..e9a944c5 100644
---
a/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-scrapeconfigs.yaml
+++
b/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-scrapeconfigs.yaml
@@ -1,3 +1,18 @@
+# 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.
+
#
https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.81.0/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
---
apiVersion: apiextensions.k8s.io/v1
diff --git
a/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-servicemonitors.yaml
b/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-servicemonitors.yaml
index e34a00bc..ead7bb8d 100644
---
a/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-servicemonitors.yaml
+++
b/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-servicemonitors.yaml
@@ -1,3 +1,18 @@
+# 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.
+
#
https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.81.0/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
---
apiVersion: apiextensions.k8s.io/v1
diff --git
a/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-thanosrulers.yaml
b/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-thanosrulers.yaml
index d3016fd1..24911184 100644
---
a/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-thanosrulers.yaml
+++
b/manifests/charts/admin/charts/kube-prometheus/charts/crds/crds/crd-thanosrulers.yaml
@@ -1,3 +1,18 @@
+# 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.
+
#
https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.81.0/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
---
apiVersion: apiextensions.k8s.io/v1
diff --git
a/manifests/charts/admin/charts/kube-prometheus/charts/crds/values.yaml
b/manifests/charts/admin/charts/kube-prometheus/charts/crds/values.yaml
index 6de4baae..969d1d2e 100644
--- a/manifests/charts/admin/charts/kube-prometheus/charts/crds/values.yaml
+++ b/manifests/charts/admin/charts/kube-prometheus/charts/crds/values.yaml
@@ -1,3 +1,18 @@
+# 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.
+
## Check out kube-prometheus-stack/values.yaml for more information
## on this parameter
upgradeJob:
diff --git
a/manifests/charts/admin/charts/kube-prometheus/charts/grafana/ci/default-values.yaml
b/manifests/charts/admin/charts/kube-prometheus/charts/grafana/ci/default-values.yaml
index fc2ba605..59dd5f99 100644
---
a/manifests/charts/admin/charts/kube-prometheus/charts/grafana/ci/default-values.yaml
+++
b/manifests/charts/admin/charts/kube-prometheus/charts/grafana/ci/default-values.yaml
@@ -1 +1,16 @@
+# 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.
+
# Leave this file empty to ensure that CI runs builds against the default
configuration in values.yaml.
diff --git
a/manifests/charts/admin/charts/kube-prometheus/charts/grafana/ci/with-affinity-values.yaml
b/manifests/charts/admin/charts/kube-prometheus/charts/grafana/ci/with-affinity-values.yaml
index f5b9b53e..78258790 100644
---
a/manifests/charts/admin/charts/kube-prometheus/charts/grafana/ci/with-affinity-values.yaml
+++
b/manifests/charts/admin/charts/kube-prometheus/charts/grafana/ci/with-affinity-values.yaml
@@ -1,3 +1,18 @@
+# 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.
+
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
diff --git
a/manifests/charts/admin/charts/kube-prometheus/charts/grafana/ci/with-dashboard-json-values.yaml
b/manifests/charts/admin/charts/kube-prometheus/charts/grafana/ci/with-dashboard-json-values.yaml
index e0c4e416..6faaa144 100644
---
a/manifests/charts/admin/charts/kube-prometheus/charts/grafana/ci/with-dashboard-json-values.yaml
+++
b/manifests/charts/admin/charts/kube-prometheus/charts/grafana/ci/with-dashboard-json-values.yaml
@@ -1,3 +1,18 @@
+# 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.
+
dashboards:
my-provider:
my-awesome-dashboard:
diff --git
a/manifests/charts/admin/charts/kube-prometheus/charts/grafana/ci/with-dashboard-values.yaml
b/manifests/charts/admin/charts/kube-prometheus/charts/grafana/ci/with-dashboard-values.yaml
index 7b662c5f..928305d0 100644
---
a/manifests/charts/admin/charts/kube-prometheus/charts/grafana/ci/with-dashboard-values.yaml
+++
b/manifests/charts/admin/charts/kube-prometheus/charts/grafana/ci/with-dashboard-values.yaml
@@ -1,3 +1,18 @@
+# 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.
+
dashboards:
my-provider:
my-awesome-dashboard:
diff --git
a/manifests/charts/admin/charts/kube-prometheus/charts/grafana/ci/with-extraconfigmapmounts-values.yaml
b/manifests/charts/admin/charts/kube-prometheus/charts/grafana/ci/with-extraconfigmapmounts-values.yaml
index 5cc44a05..77e7e743 100644
---
a/manifests/charts/admin/charts/kube-prometheus/charts/grafana/ci/with-extraconfigmapmounts-values.yaml
+++
b/manifests/charts/admin/charts/kube-prometheus/charts/grafana/ci/with-extraconfigmapmounts-values.yaml
@@ -1,3 +1,18 @@
+# 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.
+
extraConfigmapMounts:
- name: '{{ include "grafana.fullname" . }}'
configMap: '{{ include "grafana.fullname" . }}'
diff --git
a/manifests/charts/admin/charts/kube-prometheus/charts/grafana/ci/with-image-renderer-values.yaml
b/manifests/charts/admin/charts/kube-prometheus/charts/grafana/ci/with-image-renderer-values.yaml
index 06c0bda1..fecd12ff 100644
---
a/manifests/charts/admin/charts/kube-prometheus/charts/grafana/ci/with-image-renderer-values.yaml
+++
b/manifests/charts/admin/charts/kube-prometheus/charts/grafana/ci/with-image-renderer-values.yaml
@@ -1,3 +1,18 @@
+# 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.
+
podLabels:
customLableA: Aaaaa
imageRenderer:
diff --git
a/manifests/charts/admin/charts/kube-prometheus/charts/grafana/ci/with-nondefault-values.yaml
b/manifests/charts/admin/charts/kube-prometheus/charts/grafana/ci/with-nondefault-values.yaml
index 48484895..a083bb71 100644
---
a/manifests/charts/admin/charts/kube-prometheus/charts/grafana/ci/with-nondefault-values.yaml
+++
b/manifests/charts/admin/charts/kube-prometheus/charts/grafana/ci/with-nondefault-values.yaml
@@ -1,3 +1,18 @@
+# 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.
+
global:
environment: prod
ingress:
diff --git
a/manifests/charts/admin/charts/kube-prometheus/charts/grafana/ci/with-persistence.yaml
b/manifests/charts/admin/charts/kube-prometheus/charts/grafana/ci/with-persistence.yaml
index b92ca02c..ecc83b82 100644
---
a/manifests/charts/admin/charts/kube-prometheus/charts/grafana/ci/with-persistence.yaml
+++
b/manifests/charts/admin/charts/kube-prometheus/charts/grafana/ci/with-persistence.yaml
@@ -1,3 +1,18 @@
+# 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.
+
persistence:
type: pvc
enabled: true
diff --git
a/manifests/charts/admin/charts/kube-prometheus/charts/grafana/ci/with-sidecars-envvaluefrom-values.yaml
b/manifests/charts/admin/charts/kube-prometheus/charts/grafana/ci/with-sidecars-envvaluefrom-values.yaml
index a6935e56..7875b755 100644
---
a/manifests/charts/admin/charts/kube-prometheus/charts/grafana/ci/with-sidecars-envvaluefrom-values.yaml
+++
b/manifests/charts/admin/charts/kube-prometheus/charts/grafana/ci/with-sidecars-envvaluefrom-values.yaml
@@ -1,3 +1,18 @@
+# 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.
+
extraObjects:
- apiVersion: v1
kind: ConfigMap
diff --git
a/manifests/charts/admin/charts/kube-prometheus/charts/grafana/values.yaml
b/manifests/charts/admin/charts/kube-prometheus/charts/grafana/values.yaml
index 035c3cd2..e2c17c54 100644
--- a/manifests/charts/admin/charts/kube-prometheus/charts/grafana/values.yaml
+++ b/manifests/charts/admin/charts/kube-prometheus/charts/grafana/values.yaml
@@ -1,3 +1,18 @@
+# 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.
+
global:
# -- Overrides the Docker registry globally for all images
imageRegistry: null
diff --git
a/manifests/charts/admin/charts/kube-prometheus/charts/kube-state-metrics/Chart.yaml
b/manifests/charts/admin/charts/kube-prometheus/charts/kube-state-metrics/Chart.yaml
index 3c8ffbdb..a1763813 100644
---
a/manifests/charts/admin/charts/kube-prometheus/charts/kube-state-metrics/Chart.yaml
+++
b/manifests/charts/admin/charts/kube-prometheus/charts/kube-state-metrics/Chart.yaml
@@ -1,3 +1,18 @@
+# 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.
+
annotations:
artifacthub.io/license: Apache-2.0
artifacthub.io/links: |
diff --git
a/manifests/charts/admin/charts/kube-prometheus/charts/kube-state-metrics/values.yaml
b/manifests/charts/admin/charts/kube-prometheus/charts/kube-state-metrics/values.yaml
index e32bf2c8..2a492e2b 100644
---
a/manifests/charts/admin/charts/kube-prometheus/charts/kube-state-metrics/values.yaml
+++
b/manifests/charts/admin/charts/kube-prometheus/charts/kube-state-metrics/values.yaml
@@ -1,3 +1,18 @@
+# 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.
+
# Default values for kube-state-metrics.
prometheusScrape: true
image:
diff --git
a/manifests/charts/admin/charts/kube-prometheus/charts/prometheus-node-exporter/Chart.yaml
b/manifests/charts/admin/charts/kube-prometheus/charts/prometheus-node-exporter/Chart.yaml
index 4820d2a9..592fb40c 100644
---
a/manifests/charts/admin/charts/kube-prometheus/charts/prometheus-node-exporter/Chart.yaml
+++
b/manifests/charts/admin/charts/kube-prometheus/charts/prometheus-node-exporter/Chart.yaml
@@ -1,3 +1,18 @@
+# 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.
+
annotations:
artifacthub.io/license: Apache-2.0
artifacthub.io/links: |
diff --git
a/manifests/charts/admin/charts/kube-prometheus/charts/prometheus-node-exporter/values.yaml
b/manifests/charts/admin/charts/kube-prometheus/charts/prometheus-node-exporter/values.yaml
index 0ef9c937..8bc1cd58 100644
---
a/manifests/charts/admin/charts/kube-prometheus/charts/prometheus-node-exporter/values.yaml
+++
b/manifests/charts/admin/charts/kube-prometheus/charts/prometheus-node-exporter/values.yaml
@@ -1,3 +1,18 @@
+# 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.
+
# Default values for prometheus-node-exporter.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
diff --git a/manifests/charts/admin/charts/kube-prometheus/values.yaml
b/manifests/charts/admin/charts/kube-prometheus/values.yaml
index b71cd237..558b5760 100644
--- a/manifests/charts/admin/charts/kube-prometheus/values.yaml
+++ b/manifests/charts/admin/charts/kube-prometheus/values.yaml
@@ -1,3 +1,18 @@
+# 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.
+
# Default values for kube-prometheus-stack.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
diff --git a/manifests/charts/admin/values.yaml
b/manifests/charts/admin/values.yaml
index 050b3465..addfbb44 100644
--- a/manifests/charts/admin/values.yaml
+++ b/manifests/charts/admin/values.yaml
@@ -45,19 +45,19 @@ _internal_default_values_not_set:
admin:
metric:
application:
- baseURL:
http://kube-prometheus-grafana:3000/d/a0b114ca-edf7-4dfe-ac2c-34a4fc545fed/application
+ baseURL:
http://grafana:3000/d/a0b114ca-edf7-4dfe-ac2c-34a4fc545fed/application
instance:
- baseURL:
http://kube-prometheus-grafana:3000/d/dcf5defe-d198-4704-9edf-6520838880e9/instance
+ baseURL:
http://grafana:3000/d/dcf5defe-d198-4704-9edf-6520838880e9/instance
service:
- baseURL:
http://kube-prometheus-grafana:3000/d/ec689613-b4a1-45b1-b8bd-9d557059f970/service
+ baseURL:
http://grafana:3000/d/ec689613-b4a1-45b1-b8bd-9d557059f970/service
trace:
application:
- baseURL:
http://kube-prometheus-grafana:3000/d/e968a89b-f03d-42e3-8ad3-930ae815cb0f/application
+ baseURL:
http://grafana:3000/d/e968a89b-f03d-42e3-8ad3-930ae815cb0f/application
instance:
- baseURL:
http://kube-prometheus-grafana:3000/d/f5f48f75-13ec-489b-88ae-635ae38d8618/instance
+ baseURL:
http://grafana:3000/d/f5f48f75-13ec-489b-88ae-635ae38d8618/instance
service:
- baseURL:
http://kube-prometheus-grafana:3000/d/b2e178fb-ada3-4d5e-9f54-de99e7f07662/service
- prometheus:
http://kube-prometheus-kube-prome-prometheus.svc.cluster.local:9090
+ baseURL:
http://grafana:3000/d/b2e178fb-ada3-4d5e-9f54-de99e7f07662/service
+ prometheus: http://kube-prometheus-prometheus.svc.cluster.local:9090
grafana: http://47.251.1.59:3000/
kube-prometheus:
diff --git a/manifests/charts/base/templates/jobs.yaml
b/manifests/charts/base/templates/jobs.yaml
index 0e17c5aa..d56db1df 100644
--- a/manifests/charts/base/templates/jobs.yaml
+++ b/manifests/charts/base/templates/jobs.yaml
@@ -2,31 +2,28 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: rook-csi-driver-config
- namespace: {{ .Release.Namespace }}
labels:
app: rook-csi-driver
- annotations:
- "rook.sh/hook": "pre-install"
- "rook.sh/hook-weight": "0"
- "rook.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
data:
- rook.sh: |-
+ rook-setup.sh: |-
#!/usr/bin/env bash
-
- kubectl label node osp ceph-mon=enabled
- kubectl label node osp ceph-mgr=enabled
- kubectl label node osp ceph-mds=enabled
- kubectl label node osp ceph-osd=enabled
-
- git clone https://github.com/rook/rook.git ; cd rook/deploy/examples/
+
+ set -ex
+
+ if [ ! -d "rook" ]; then
+ echo "Pull Rook Project"
+ git clone https://github.com/rook/rook.git
+ else
+ echo "Rook Project Exist，Continue editing..."
+ fi
+
+ cd rook/deploy/examples/
sed -i 's/ROOK_DISCOVER_DEVICES_INTERVAL:
"60m"/ROOK_DISCOVER_DEVICES_INTERVAL: "60s"/' operator.yaml
- kubectl apply -f crds.yaml -f common.yaml -f operator.yaml
sed -i 's/useAllNodes: true/useAllNodes: false/' cluster.yaml
sed -i 's/useAllDevices: true/useAllDevices: false/' cluster.yaml
sed -i '/^ mon:/,/^ count:/s/^\( count:\) [0-9]\+/\1 1/'
cluster.yaml
sed -i '/mon:/, /allowMultiplePerNode:/ s/allowMultiplePerNode:
false/allowMultiplePerNode: true/' cluster.yaml
sed -i '/^ mgr:/,/^ count:/s/^\( count:\) [0-9]\+/\1 1/'
cluster.yaml
-
sed -i '/resources:/,/^[^ ]/ {
/resources:/c\
resources:\
@@ -59,7 +56,7 @@ data:
cpu: "512m"\
memory: "2048Mi"
}' cluster.yaml
-
+
sed -i 's/^ # placement:/ placement:/' cluster.yaml
sed -i '/placement:/,/^[^ ]/ {
/placement:/c\
@@ -101,7 +98,7 @@ data:
values:\
- enabled
}' cluster.yaml
-
+
sed -i 's/^ # nodes:/ nodes:/' cluster.yaml
sed -i '/nodes:/,/^[^ ]/ {
/nodes:/c\
@@ -113,39 +110,94 @@ data:
storeType: bluestore\
journalSizeMB: "4096"
}' cluster.yaml
-
+
+ kubectl label node osp ceph-mon=enabled
+ kubectl label node osp ceph-mgr=enabled
+ kubectl label node osp ceph-mds=enabled
+ kubectl label node osp ceph-osd=enabled
+
+ kubectl apply -f crds.yaml -f common.yaml -f operator.yaml
kubectl apply -f cluster.yaml -f toolbox.yaml -f
dashboard-external-https.yaml
---
apiVersion: batch/v1
kind: Job
metadata:
- name: dubbo-rook-csi-driver
- namespace: {{ .Release.Namespace }}
+ name: rook-job
labels:
app: rook-csi-driver
- annotations:
- "rook.sh/hook": "pre-install"
- "rook.sh/hook-weight": "1"
- "rook.sh/hook-delete-policy": "hook-succeeded"
spec:
template:
metadata:
- name: dubbo-rook-csi-driver
+ name: rook-job
spec:
- restartPolicy: Never
+ hostNetwork: true
+ restartPolicy: OnFailure
+ serviceAccountName: rook-admin
containers:
- - name: busybox
- image: busybox
+ - name: rook-setup
+ image: mfordjody/rook-setup:dev
+ imagePullPolicy: Always
command:
- - "/bin/sh"
- - "-c"
- - "sh /files/rook.sh"
+ - /bin/sh
+ - -c
+ - sh /scripts/rook-setup.sh
volumeMounts:
- name: scripts
- mountPath: /files/rook.sh
- subPath: rook.sh
+ mountPath: /scripts
volumes:
- name: scripts
configMap:
name: rook-csi-driver-config
- defaultMode: 0755
\ No newline at end of file
+ defaultMode: 0755
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+ name: rook-admin
+ namespace: default
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+ name: rook-admin-role
+rules:
+- apiGroups: [""]
+ resources: ["nodes"]
+ verbs: ["get", "list", "watch", "patch", "update"]
+- apiGroups: [""]
+ resources: ["pods", "services", "configmaps", "namespaces"]
+ verbs: ["*"]
+- apiGroups: ["apps"]
+ resources: ["deployments"]
+ verbs: ["*"]
+- apiGroups: ["batch"]
+ resources: ["jobs"]
+ verbs: ["*"]
+- apiGroups: ["apiextensions.k8s.io"]
+ resources: ["customresourcedefinitions"]
+ verbs: ["*"]
+- apiGroups: ["rbac.authorization.k8s.io"]
+ resources: ["clusterroles", "clusterrolebindings"]
+ verbs: ["*"]
+- apiGroups: ["rbac.authorization.k8s.io"]
+ resources: ["roles", "rolebindings"]
+ verbs: ["*"]
+- apiGroups: [""]
+ resources: ["serviceaccounts"]
+ verbs: ["*"]
+- apiGroups: ["ceph.rook.io"]
+ resources: ["cephclusters"]
+ verbs: ["*"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+ name: rook-admin-binding
+roleRef:
+ apiGroup: rbac.authorization.k8s.io
+ kind: ClusterRole
+ name: rook-admin-role
+subjects:
+ - kind: ServiceAccount
+ name: rook-admin
+ namespace: default
\ No newline at end of file
