Skip to content

Commit 11845e6

Browse files
committed
charts/apis: add monitoring schema for credential managers
Signed-off-by: Tamal Saha <tamal@appscode.com>
1 parent 28ff5e7 commit 11845e6

File tree

7 files changed

+46
-0
lines changed

7 files changed

+46
-0
lines changed

apis/installer/v1alpha1/aws_credential_manager_types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ type AwsCredentialManagerSpec struct {
8484
VolumeMounts []core.VolumeMount `json:"volumeMounts"`
8585
// +optional
8686
Distro shared.DistroSpec `json:"distro"`
87+
Monitoring Monitoring `json:"monitoring"`
8788
// +optional
8889
Apiserver AwsCredentialManagerApiserver `json:"apiserver"`
8990
// +optional

apis/installer/v1alpha1/gcp_credential_manager_types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ type GcpCredentialManagerSpec struct {
8484
VolumeMounts []core.VolumeMount `json:"volumeMounts"`
8585
// +optional
8686
Distro shared.DistroSpec `json:"distro"`
87+
Monitoring Monitoring `json:"monitoring"`
8788
// +optional
8889
Apiserver GcpCredentialManagerApiserver `json:"apiserver"`
8990
// +optional

apis/installer/v1alpha1/zz_generated.deepcopy.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

charts/aws-credential-manager/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ The following table lists the configurable parameters of the `aws-credential-man
9797
| apiserver.servingCerts.caCrt | CA certficate used by serving certificate of webhook server. | <code>""</code> |
9898
| apiserver.servingCerts.serverCrt | Serving certficate used by webhook server. | <code>""</code> |
9999
| apiserver.servingCerts.serverKey | Private key for the serving certificate used by webhook server. | <code>""</code> |
100+
| monitoring.agent | Name of monitoring agent (one of "prometheus.io", "prometheus.io/operator", "prometheus.io/builtin") | <code>""</code> |
101+
| monitoring.serviceMonitor.labels | Specify the labels for ServiceMonitor. Prometheus crd will select ServiceMonitor using these labels. Only usable when monitoring agent is `prometheus.io/operator`. | <code>{}</code> |
100102

101103

102104
Specify each parameter using the `--set key=value[,key=value]` argument to `helm upgrade -i`. For example:

charts/aws-credential-manager/values.openapiv3_schema.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -610,6 +610,25 @@ properties:
610610
format: int32
611611
type: integer
612612
type: object
613+
monitoring:
614+
properties:
615+
agent:
616+
enum:
617+
- prometheus.io
618+
- prometheus.io/operator
619+
- prometheus.io/builtin
620+
type: string
621+
serviceMonitor:
622+
properties:
623+
labels:
624+
additionalProperties:
625+
type: string
626+
type: object
627+
type: object
628+
required:
629+
- agent
630+
- serviceMonitor
631+
type: object
613632
nameOverride:
614633
type: string
615634
nodeSelector:

charts/gcp-credential-manager/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ The following table lists the configurable parameters of the `gcp-credential-man
9797
| apiserver.servingCerts.caCrt | CA certficate used by serving certificate of webhook server. | <code>""</code> |
9898
| apiserver.servingCerts.serverCrt | Serving certficate used by webhook server. | <code>""</code> |
9999
| apiserver.servingCerts.serverKey | Private key for the serving certificate used by webhook server. | <code>""</code> |
100+
| monitoring.agent | Name of monitoring agent (one of "prometheus.io", "prometheus.io/operator", "prometheus.io/builtin") | <code>""</code> |
101+
| monitoring.serviceMonitor.labels | Specify the labels for ServiceMonitor. Prometheus crd will select ServiceMonitor using these labels. Only usable when monitoring agent is `prometheus.io/operator`. | <code>{}</code> |
100102

101103

102104
Specify each parameter using the `--set key=value[,key=value]` argument to `helm upgrade -i`. For example:

charts/gcp-credential-manager/values.openapiv3_schema.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -610,6 +610,25 @@ properties:
610610
format: int32
611611
type: integer
612612
type: object
613+
monitoring:
614+
properties:
615+
agent:
616+
enum:
617+
- prometheus.io
618+
- prometheus.io/operator
619+
- prometheus.io/builtin
620+
type: string
621+
serviceMonitor:
622+
properties:
623+
labels:
624+
additionalProperties:
625+
type: string
626+
type: object
627+
type: object
628+
required:
629+
- agent
630+
- serviceMonitor
631+
type: object
613632
nameOverride:
614633
type: string
615634
nodeSelector:

0 commit comments

Comments
 (0)