This repository has been archived by the owner on Apr 19, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 44
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #155 from obrienrobert/bump-amo-1.4.0
Bump AMO to 1.4.0 and Grafana operator to v3.6.0
- Loading branch information
Showing
14 changed files
with
1,324 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
336 changes: 336 additions & 0 deletions
336
...nitoring-operator/1.4.0/application-monitoring-operator.v1.4.0.clusterserviceversion.yaml
Large diffs are not rendered by default.
Oops, something went wrong.
645 changes: 645 additions & 0 deletions
645
...ring-operator/1.4.0/applicationmonitoring.integreatly.org_applicationmonitorings_crd.yaml
Large diffs are not rendered by default.
Oops, something went wrong.
71 changes: 71 additions & 0 deletions
71
...-monitoring-operator/1.4.0/applicationmonitoring.integreatly.org_blackboxtargets_crd.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| apiVersion: apiextensions.k8s.io/v1beta1 | ||
| kind: CustomResourceDefinition | ||
| metadata: | ||
| name: blackboxtargets.applicationmonitoring.integreatly.org | ||
| spec: | ||
| group: applicationmonitoring.integreatly.org | ||
| names: | ||
| kind: BlackboxTarget | ||
| listKind: BlackboxTargetList | ||
| plural: blackboxtargets | ||
| singular: blackboxtarget | ||
| scope: Namespaced | ||
| validation: | ||
| openAPIV3Schema: | ||
| description: BlackboxTarget is the Schema for the blackboxtargets API | ||
| properties: | ||
| apiVersion: | ||
| description: 'APIVersion defines the versioned schema of this representation | ||
| of an object. Servers should convert recognized schemas to the latest | ||
| internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' | ||
| type: string | ||
| kind: | ||
| description: 'Kind is a string value representing the REST resource this | ||
| object represents. Servers may infer this from the endpoint the client | ||
| submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' | ||
| type: string | ||
| metadata: | ||
| type: object | ||
| spec: | ||
| description: BlackboxTargetSpec defines the desired state of BlackboxTarget | ||
| properties: | ||
| blackboxTargets: | ||
| description: 'INSERT ADDITIONAL SPEC FIELDS - desired state of cluster | ||
| Important: Run "operator-sdk generate k8s" to regenerate code after | ||
| modifying this file Add custom validation using kubebuilder tags: | ||
| https://book.kubebuilder.io/beyond_basics/generating_crd.html' | ||
| items: | ||
| description: 'BlackboxtargetStructure contains: A target (url, module | ||
| and service name) to be probed by the' | ||
| properties: | ||
| module: | ||
| type: string | ||
| service: | ||
| type: string | ||
| url: | ||
| type: string | ||
| required: | ||
| - module | ||
| - service | ||
| - url | ||
| type: object | ||
| type: array | ||
| type: object | ||
| status: | ||
| description: BlackboxTargetStatus defines the observed state of BlackboxTarget | ||
| properties: | ||
| phase: | ||
| description: 'INSERT ADDITIONAL STATUS FIELD - define observed state | ||
| of cluster Important: Run "operator-sdk generate k8s" to regenerate | ||
| code after modifying this file Add custom validation using kubebuilder | ||
| tags: https://book.kubebuilder.io/beyond_basics/generating_crd.html' | ||
| type: integer | ||
| required: | ||
| - phase | ||
| type: object | ||
| type: object | ||
| version: v1alpha1 | ||
| versions: | ||
| - name: v1alpha1 | ||
| served: true | ||
| storage: true |
149 changes: 149 additions & 0 deletions
149
deploy/olm-catalog/application-monitoring-operator/1.4.0/grafana_crd.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,149 @@ | ||
| apiVersion: apiextensions.k8s.io/v1beta1 | ||
| kind: CustomResourceDefinition | ||
| metadata: | ||
| name: grafanas.integreatly.org | ||
| spec: | ||
| group: integreatly.org | ||
| names: | ||
| kind: Grafana | ||
| listKind: GrafanaList | ||
| plural: grafanas | ||
| singular: grafana | ||
| scope: Namespaced | ||
| subresources: | ||
| status: {} | ||
| version: v1alpha1 | ||
| validation: | ||
| openAPIV3Schema: | ||
| required: ["spec"] | ||
| properties: | ||
| spec: | ||
| properties: | ||
| containers: | ||
| type: array | ||
| items: | ||
| type: object | ||
| description: Additional container to add to the grafana pod | ||
| secrets: | ||
| type: array | ||
| items: | ||
| type: string | ||
| description: Secret to be mounted as volume into the grafana deployment | ||
| configMaps: | ||
| type: array | ||
| items: | ||
| type: string | ||
| description: Config map to be mounted as volume into the grafana deployment | ||
| logLevel: | ||
| type: string | ||
| description: Log level of the grafana instance, defaults to info | ||
| adminUser: | ||
| type: string | ||
| description: Default admin user name | ||
| adminPassword: | ||
| type: string | ||
| description: Default admin password | ||
| basicAuth: | ||
| type: boolean | ||
| description: Basic auth enabled | ||
| disableLoginForm: | ||
| type: boolean | ||
| description: Disable login form | ||
| disableSignoutMenu: | ||
| type: boolean | ||
| description: Disable signout menu | ||
| anonymous: | ||
| type: boolean | ||
| description: Anonymous auth enabled | ||
| config: | ||
| type: object | ||
| description: Grafana config | ||
| ingress: | ||
| type: object | ||
| properties: | ||
| enabled: | ||
| type: boolean | ||
| description: Create an ingress / route | ||
| path: | ||
| type: string | ||
| description: Ingress path | ||
| hostname: | ||
| type: string | ||
| description: The hostname of the ingress / route | ||
| annotations: | ||
| type: object | ||
| description: Additional annotations for the ingress / route | ||
| labels: | ||
| type: object | ||
| description: Additional labels for the ingress / route | ||
| targetPort: | ||
| type: string | ||
| description: Override port to target in the grafana service | ||
| service: | ||
| type: object | ||
| properties: | ||
| ports: | ||
| type: array | ||
| description: Override default ports | ||
| items: | ||
| type: object | ||
| description: A port to add to the grafana service | ||
| annotations: | ||
| type: object | ||
| description: Additional annotations for the service | ||
| labels: | ||
| type: object | ||
| description: Additional labels for the service | ||
| type: | ||
| type: string | ||
| description: Service type (NodePort, ClusterIP or LoadBalancer) | ||
| deployment: | ||
| type: object | ||
| properties: | ||
| annotations: | ||
| type: object | ||
| description: Additional annotations for the service | ||
| labels: | ||
| type: object | ||
| description: Additional labels for the service | ||
| nodeSelector: | ||
| type: object | ||
| description: Additional labels for the running grafana pods in a labeled node. | ||
| tolerations: | ||
| type: array | ||
| description: Additonal labels for running grafana pods in tained nodes. | ||
| affinity: | ||
| type: object | ||
| description: Additonal labels for running grafana pods with affinity properties. | ||
| envFrom: | ||
| type: array | ||
| description: Environment variables from Secret or ConfigMap. | ||
| skipCreateAdminAccount: | ||
| type: boolean | ||
| description: Disable creating a random admin user | ||
| priorityClassName: | ||
| type: string | ||
| description: Pod priority class name | ||
| serviceAccount: | ||
| type: object | ||
| properties: | ||
| annotations: | ||
| type: object | ||
| description: Additional annotations for the serviceaccount | ||
| labels: | ||
| type: object | ||
| description: Additional labels for the serviceaccount | ||
| client: | ||
| type: object | ||
| description: Grafana client settings | ||
| compat: | ||
| type: object | ||
| description: Backwards compatibility switches | ||
| dashboardLabelSelectors: | ||
| type: array | ||
| items: | ||
| type: object | ||
| description: Label selector or match expressions | ||
| jsonnet: | ||
| type: object | ||
| description: Jsonnet library configuration |
43 changes: 43 additions & 0 deletions
43
deploy/olm-catalog/application-monitoring-operator/1.4.0/grafana_dashboard_crd.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| apiVersion: apiextensions.k8s.io/v1beta1 | ||
| kind: CustomResourceDefinition | ||
| metadata: | ||
| name: grafanadashboards.integreatly.org | ||
| spec: | ||
| group: integreatly.org | ||
| names: | ||
| kind: GrafanaDashboard | ||
| listKind: GrafanaDashboardList | ||
| plural: grafanadashboards | ||
| singular: grafanadashboard | ||
| scope: Namespaced | ||
| subresources: | ||
| status: {} | ||
| version: v1alpha1 | ||
| validation: | ||
| openAPIV3Schema: | ||
| properties: | ||
| spec: | ||
| properties: | ||
| name: | ||
| type: string | ||
| json: | ||
| type: string | ||
| jsonnet: | ||
| description: Jsonnet source. Has access to grafonnet. | ||
| type: string | ||
| url: | ||
| type: string | ||
| description: URL to dashboard json | ||
| datasources: | ||
| type: array | ||
| items: | ||
| description: Input datasources to resolve before importing | ||
| type: object | ||
| plugins: | ||
| type: array | ||
| items: | ||
| description: Grafana Plugin Object | ||
| type: object | ||
| customFolderName: | ||
| description: Folder name that this dashboard will be assigned to. | ||
| type: string |
35 changes: 35 additions & 0 deletions
35
deploy/olm-catalog/application-monitoring-operator/1.4.0/grafana_datasource_crd.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| apiVersion: apiextensions.k8s.io/v1beta1 | ||
| kind: CustomResourceDefinition | ||
| metadata: | ||
| name: grafanadatasources.integreatly.org | ||
| spec: | ||
| group: integreatly.org | ||
| names: | ||
| kind: GrafanaDataSource | ||
| listKind: GrafanaDataSourceList | ||
| plural: grafanadatasources | ||
| singular: grafanadatasource | ||
| scope: Namespaced | ||
| subresources: | ||
| status: {} | ||
| version: v1alpha1 | ||
| validation: | ||
| openAPIV3Schema: | ||
| properties: | ||
| apiVersion: | ||
| type: string | ||
| kind: | ||
| type: string | ||
| metadata: | ||
| type: object | ||
| spec: | ||
| required: ["datasources", "name"] | ||
| properties: | ||
| name: | ||
| type: string | ||
| minimum: 1 | ||
| datasources: | ||
| type: array | ||
| items: | ||
| description: Grafana Datasource Object | ||
| type: object |
2 changes: 1 addition & 1 deletion
2
.../olm-catalog/application-monitoring-operator/application-monitoring-operator.package.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| channels: | ||
| - currentCSV: application-monitoring-operator.v1.3.0 | ||
| - currentCSV: application-monitoring-operator.v1.4.0 | ||
| name: integreatly | ||
| defaultChannel: integreatly | ||
| packageName: application-monitoring-operator |
Oops, something went wrong.