Skip to content
This repository has been archived by the owner on Apr 19, 2023. It is now read-only.

Commit

Permalink
Feat: updated to v1.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jackdelahunt committed Aug 30, 2021
1 parent 7228c70 commit 008b40e
Show file tree
Hide file tree
Showing 14 changed files with 1,340 additions and 20 deletions.
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ COMPILE_TARGET=./tmp/_output/bin/$(PROJECT)
# You can delete this comment afterwards.
PROMETHEUS_OPERATOR_VERSION=v0.40.0
LOCAL=local
GRAFANA_OPERATOR_VERSION=v3.10.2
AMO_VERSION=1.7.0
PREV_AMO_VERSION=1.6.3
GRAFANA_OPERATOR_VERSION=v3.10.3
AMO_VERSION=1.8.0
PREV_AMO_VERSION=1.7.0

AUTH_TOKEN=$(shell curl -sH "Content-Type: application/json" -XPOST https://quay.io/cnr/api/v1/users/login -d '{"user": {"username": "$(QUAY_USERNAME)", "password": "${QUAY_PASSWORD}"}}' | jq -r '.token')

Expand All @@ -34,7 +34,7 @@ setup/travis:

.PHONY: code/run
code/run:
@operator-sdk run --local --namespace=${NAMESPACE}
LOCAL_INSTALL="True" operator-sdk run --local --namespace=${NAMESPACE}

.PHONY: code/compile
code/compile:
Expand All @@ -61,11 +61,11 @@ code/fix:

.PHONY: image/build
image/build: code/compile
@operator-sdk build ${REG}/${ORG}/${PROJECT}:${AMO_VERSION}
@operator-sdk build ${REG}/${ORG}/${PROJECT}:v${AMO_VERSION}

.PHONY: image/push
image/push:
docker push ${REG}/${ORG}/${PROJECT}:${AMO_VERSION}
docker push ${REG}/${ORG}/${PROJECT}:v${AMO_VERSION}

.PHONY: image/build/push
image/build/push: image/build image/push
Expand Down
26 changes: 25 additions & 1 deletion deploy/cluster-roles/prometheus-operator-clusterrole.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,12 @@ rules:
- thanosrulers
- prometheuses/finalizers
- alertmanagers/finalizers
- alertmanagerconfigs
- thanosrulers/finalizers
- servicemonitors
- prometheusrules
- podmonitors
- probes
verbs:
- '*'
- apiGroups:
Expand Down Expand Up @@ -65,4 +67,26 @@ rules:
verbs:
- get
- list
- watch
- watch
- apiGroups:
- applicationmonitoring.integreatly.org
resources:
- applicationmonitorings
verbs:
- get
- list
- update
- watch
- apiGroups:
- integreatly.org
resources:
- grafanas
- grafanas/finalizers
- grafanadashboards
- grafanadashboards/status
- grafanadashboards/finalizers
- grafanadatasources
- grafanadatasources/finalizers
verbs:
- get
- list

Large diffs are not rendered by default.

Large diffs are not rendered by default.

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
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
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:
skip:
type: boolean
description: Disable ServiceAccount creation for grafana
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
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
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
channels:
- currentCSV: application-monitoring-operator.v1.7.0
- currentCSV: application-monitoring-operator.v1.8.0
name: integreatly
defaultChannel: integreatly
packageName: application-monitoring-operator
Loading

0 comments on commit 008b40e

Please sign in to comment.