Remove Minio Components from airship-core lma
Work on this minio chart has been halted, so we need an alternative S3 provider in the long term (#111). Removing references to this function and associated CRs from airship-core deployments and the lma-configs composite Also, taking the opportunity to move our cluster flow & output definitions out of the logging-operator-logging HelmRelease and into proper CR documents Relates-To: #111 Relates-To: #150 Change-Id: Id4b4b8d07fb6b38ba033e76a015d8703efca727a
This commit is contained in:
Steven Fitzpatrick
parent
fdcac8d9fb
commit
8ad827159a
|
|
@ -1,4 +1,4 @@
|
|||
apiVersion: v1
|
||||
kind: Namespace
|
||||
metadata:
|
||||
name: lma-infra
|
||||
name: lma
|
||||
|
|
|
|||
|
|
@ -27,21 +27,3 @@ spec:
|
|||
tolerations:
|
||||
- key: node-role.kubernetes.io/master
|
||||
effect: NoSchedule
|
||||
clusterFlows:
|
||||
- name: all-pods
|
||||
spec:
|
||||
globalOutputRefs:
|
||||
- elasticsearch
|
||||
clusterOutputs:
|
||||
- name: elasticsearch
|
||||
spec:
|
||||
elasticsearch:
|
||||
host: elasticsearch-ingest.lma-infra.svc.cluster.local
|
||||
port: 9200
|
||||
scheme: https
|
||||
ssl_verify: false
|
||||
ssl_version: TLSv1_2
|
||||
buffer:
|
||||
timekey: 1m
|
||||
timekey_wait: 30s
|
||||
timekey_use_utc: true
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ spec:
|
|||
datasources:
|
||||
- name: lma-infra-thanos
|
||||
type: prometheus
|
||||
url: lma-infra-thanos-query.lma-infra.svc.cluster.local:10902
|
||||
url: lma-infra-thanos-query.lma.svc.cluster.local:10902
|
||||
dashboardProviders:
|
||||
dashboardproviders.yaml:
|
||||
apiVersion: 1
|
||||
|
|
|
|||
|
|
@ -0,0 +1,20 @@
|
|||
apiVersion: logging.banzaicloud.io/v1beta1
|
||||
kind: ClusterFlow
|
||||
metadata:
|
||||
name: all-pods
|
||||
spec:
|
||||
match:
|
||||
- select: {}
|
||||
filters:
|
||||
- enhanceK8s: {}
|
||||
- tag_normaliser:
|
||||
format: ${namespace_name}.${pod_name}.${container_name}
|
||||
- parser:
|
||||
reserve_data: true
|
||||
parse:
|
||||
type: multi-format
|
||||
patterns:
|
||||
- format: nginx
|
||||
- format: json
|
||||
- format: multiline
|
||||
globalOutputRefs: elasticsearch
|
||||
|
|
@ -1,2 +1,2 @@
|
|||
resources:
|
||||
- minio.yaml
|
||||
- cluster-flow-all.yaml
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
apiVersion: logging.banzaicloud.io/v1beta1
|
||||
kind: Flow
|
||||
metadata:
|
||||
name: lma-infra-minio
|
||||
spec:
|
||||
loggingRef: lma-infra-logging
|
||||
match:
|
||||
- select:
|
||||
labels:
|
||||
app: minio
|
||||
localOutputRefs:
|
||||
- lma-infra-minio
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
apiVersion: logging.banzaicloud.io/v1beta1
|
||||
kind: ClusterOutput
|
||||
metadata:
|
||||
name: elasticsearch
|
||||
spec:
|
||||
loggingRef: lma-infra-logging
|
||||
elasticsearch:
|
||||
# TODO: Replace this with the real endpoint
|
||||
host: elasticsearch-ingest.lma.svc.cluster.local
|
||||
port: 9200
|
||||
scheme: https
|
||||
ssl_verify: false
|
||||
ssl_version: TLSv1_2
|
||||
buffer:
|
||||
timekey: 1m
|
||||
timekey_wait: 30s
|
||||
timekey_use_utc: true
|
||||
|
|
@ -1,2 +1,2 @@
|
|||
resources:
|
||||
- minio.yaml
|
||||
- cluster-output-elasticsearch.yaml
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
apiVersion: logging.banzaicloud.io/v1beta1
|
||||
kind: Output
|
||||
metadata:
|
||||
name: lma-infra-minio
|
||||
spec:
|
||||
loggingRef: lma-infra-logging
|
||||
s3:
|
||||
aws_key_id:
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
key: fluentd-accesskey
|
||||
name: lma-infra-object-store
|
||||
aws_sec_key:
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
key: fluentd-secretkey
|
||||
name: lma-infra-object-store
|
||||
buffer:
|
||||
timekey: 10s
|
||||
timekey_use_utc: true
|
||||
timekey_wait: 0s
|
||||
force_path_style: "true"
|
||||
path: ${tag}/%Y/%m/%d/
|
||||
s3_bucket: logs
|
||||
s3_endpoint: http://minio.lma-infra.svc.cluster.local:9000
|
||||
|
|
@ -1,2 +1 @@
|
|||
resources:
|
||||
- servicemonitors/lma-infra-minio.yaml
|
||||
resources: []
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
apiVersion: monitoring.coreos.com/v1
|
||||
kind: ServiceMonitor
|
||||
metadata:
|
||||
name: lma-infra-minio
|
||||
labels:
|
||||
app: minio
|
||||
spec:
|
||||
selector:
|
||||
matchLabels:
|
||||
app: minio
|
||||
endpoints:
|
||||
- port: metrics
|
||||
path: /minio/prometheus/metrics
|
||||
|
|
@ -1,4 +1,3 @@
|
|||
resources:
|
||||
- lma-infra-thanos.yaml
|
||||
- storeendpoints
|
||||
- objectstores
|
||||
|
|
|
|||
|
|
@ -1,2 +1 @@
|
|||
resources:
|
||||
- lma-infra-thanos-minio.yaml
|
||||
resources: []
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
apiVersion: monitoring.banzaicloud.io/v1alpha1
|
||||
kind: ObjectStore
|
||||
metadata:
|
||||
name: lma-infra-thanos-minio
|
||||
spec:
|
||||
config:
|
||||
mountFrom:
|
||||
secretKeyRef:
|
||||
name: lma-infra-object-store
|
||||
key: thanos-config.yaml
|
||||
bucketWeb: {}
|
||||
compactor: {}
|
||||
|
|
@ -1,3 +1,2 @@
|
|||
resources:
|
||||
- lma-infra-prometheus.yaml
|
||||
- lma-infra-minio.yaml
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
apiVersion: monitoring.banzaicloud.io/v1alpha1
|
||||
kind: StoreEndpoint
|
||||
metadata:
|
||||
name: lma-infra-minio
|
||||
spec:
|
||||
thanos: lma-infra-thanos
|
||||
config:
|
||||
mountFrom:
|
||||
secretKeyRef:
|
||||
name: lma-infra-object-store
|
||||
key: thanos-config.yaml
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
apiVersion: v1
|
||||
kind: Secret
|
||||
metadata:
|
||||
name: lma-infra-object-store
|
||||
type: Opaque
|
||||
stringData:
|
||||
fluentd-accesskey: admin
|
||||
fluentd-secretkey: changeme
|
||||
thanos-config.yaml: |
|
||||
type: s3
|
||||
config:
|
||||
insecure: true
|
||||
endpoint: minio.lma-infra.svc.cluster.local:9000
|
||||
bucket: metrics
|
||||
region: lma-infra
|
||||
access_key: admin
|
||||
secret_key: changeme
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
apiVersion: v1
|
||||
kind: Secret
|
||||
metadata:
|
||||
name: minio-admin-secret
|
||||
type: Opaque
|
||||
stringData:
|
||||
accesskey: admin
|
||||
secretkey: changeme
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
apiVersion: "helm.toolkit.fluxcd.io/v2beta1"
|
||||
kind: HelmRelease
|
||||
metadata:
|
||||
name: minio
|
||||
spec:
|
||||
values:
|
||||
replicas: 1
|
||||
persistence:
|
||||
enabled: false
|
||||
existingSecret: minio-admin-secret
|
||||
buckets:
|
||||
- name: logs
|
||||
policy: none
|
||||
purge: false
|
||||
- name: metrics
|
||||
policy: none
|
||||
purge: false
|
||||
Loading…
Reference in New Issue