Update lma in airship-core type

This change updates the lma phase-related documents in the airship-core type. Instead of using distinct phase entrypoints for the various LMA composites, they're now incorprated in the airship-core type workload-target and workload-config phases Relates-To: #150 Change-Id: If3214898888345e4e065f2f7a8756bd4b84bc0df
2021-06-03 03:24:59 +00:00 · 2021-06-03 03:24:59 +00:00 · cb0c8fc2af
commit cb0c8fc2af
parent 4e4c944fdd
17 changed files with 67 additions and 77 deletions
--- a/manifests/composite/elastic-stack/patches/kibana.yaml
+++ b/manifests/composite/elastic-stack/patches/kibana.yaml
@ -3,6 +3,9 @@ kind: HelmRelease
 metadata:
  name: kibana
 spec:
+  dependsOn:
+    - name: elasticsearch-ingest
+    - name: elasticsearch-data
  values:
    elasticsearchHosts: "http://elasticsearch-ingest.lma.svc.cluster.local:9200"
    replicas: 1
--- a/manifests/composite/lma-infra/patches/kube-prometheus-stack.yaml
+++ b/manifests/composite/lma-infra/patches/kube-prometheus-stack.yaml
@ -17,10 +17,6 @@ spec:
        podMetadata:
          labels:
            storeAPI: enabled
-        thanos:
-          objectStorageConfig:
-            name: lma-infra-object-store
-            key: thanos-config.yaml

    prometheusOperator:
      admissionWebhooks:
--- a/manifests/function/lma-configs/logging/flows/cluster-flow-all.yaml
+++ b/manifests/function/lma-configs/logging/flows/cluster-flow-all.yaml
@ -17,4 +17,5 @@ spec:
            - format: nginx
            - format: json
            - format: multiline
-  globalOutputRefs: elasticsearch
+  globalOutputRefs:
+    - elasticsearch
--- a/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml
+++ b/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml
@ -38,19 +38,19 @@ spec:
  charts:
    elasticsearch:
      chart: elasticsearch
-      version: 7.12.1
+      version: 7.11.2
    grafana:
      chart: grafana
      version: 6.9.1
    kibana:
      chart: kibana
-      version: 7.12.1
+      version: 7.11.2
    kube_prometheus_stack:
      chart: kube-prometheus-stack
      version: 16.0.1
    logging_operator:
      chart: logging-operator
-      version: 3.9.5
+      version: 3.10.0
    logging_operator_logging:
      chart: logging-operator-logging
      version: 3.9.5
@ -172,7 +172,7 @@ spec:
    elasticsearch:
      elasticsearch:
        repository: docker.elastic.co/elasticsearch/elasticsearch
-        tag: 7.12.1
+        tag: 7.11.2
    grafana:
      grafana:
        repository: grafana/grafana
@ -180,7 +180,7 @@ spec:
    kibana:
      kibana:
        repository: docker.elastic.co/kibana/kibana
-        tag: 7.12.1
+        tag: 7.11.2
    kube_prometheus_stack:
      admission_webhooks:
        repository: jettech/kube-webhook-certgen
@ -200,17 +200,17 @@ spec:
    logging_operator:
      logging_operator:
        repository: ghcr.io/banzaicloud/logging-operator
-        tag: 3.9.5
+        tag: 3.10.0
    logging_operator_logging:
      config_reloader:
        repository: jimmidyson/configmap-reload
-        tag: v0.4.0
+        tag: v0.5.0
      fluentbit:
        repository: fluent/fluent-bit
-        tag: 1.7.4
+        tag: 1.7.9
      fluentd:
        repository: ghcr.io/banzaicloud/fluentd
-        tag: v1.11.5-alpine-21
+        tag: v1.11.5-alpine-24
      volume_mod:
        repository: busybox
        tag: latest
--- a/manifests/site/reference-airship-core/target/lma-configs/kustomization.yaml
+++ b/manifests/site/reference-airship-core/target/lma-configs/kustomization.yaml
@ -1,4 +0,0 @@
-resources:
-  - ../../../../function/lma-configs
-
-namespace: lma
--- a/manifests/site/reference-airship-core/target/lma-infra/kustomization.yaml
+++ b/manifests/site/reference-airship-core/target/lma-infra/kustomization.yaml
@ -1,9 +0,0 @@
-resources:
-  - ../../../../composite/lma-infra
-  - ../catalogues
-  - lma-infra-object-store.yaml
-
-transformers:
-  - ../../../../composite/lma-infra/replacements
-
-namespace: lma
--- a/manifests/site/reference-airship-core/target/lma-stack/kustomization.yaml
+++ b/manifests/site/reference-airship-core/target/lma-stack/kustomization.yaml
@ -1,14 +0,0 @@
-resources:
-  - ../../../../composite/monitoring-stack
-  - ../../../../function/minio
-  - ../catalogues
-  - minio-admin-secret.yaml
-
-transformers:
-  - ../../../../composite/monitoring-stack/replacements
-  - ../../../../function/minio/replacements
-
-namespace: lma
-
-patches:
-  - path: patches/minio.yaml
--- a/manifests/site/reference-airship-core/target/workload-config/kustomization.yaml
+++ b/manifests/site/reference-airship-core/target/workload-config/kustomization.yaml
@ -0,0 +1,5 @@
+resources:
+  - ../../../../type/airship-core/target/workload-config
+  - ../catalogues
+transformers:
+  - ../../../../type/airship-core/target/workload-config/replacements
--- a/manifests/site/test-site/target/workload-config/kustomization.yaml
+++ b/manifests/site/test-site/target/workload-config/kustomization.yaml
@ -0,0 +1,5 @@
+resources:
+  - ../../../../type/airship-core/target/workload-config
+  - ../catalogues
+transformers:
+  - ../../../../type/airship-core/target/workload-config/replacements
--- a/manifests/type/airship-core/phases/kustomization.yaml
+++ b/manifests/type/airship-core/phases/kustomization.yaml
@ -1,9 +1,9 @@
 resources:
  - ../../../../../airshipctl/manifests/phases/
-  - lma-infra-target.yaml
  - ../../../function/phase-helper/
  - executors.yaml
  - phases.yaml
+  - workload-config.yaml

 patchesStrategicMerge:
   - plan-patch.yaml
--- a/manifests/type/airship-core/phases/lma-infra-target.yaml
+++ b/manifests/type/airship-core/phases/lma-infra-target.yaml
@ -1,35 +0,0 @@
-apiVersion: airshipit.org/v1alpha1
-kind: Phase
-metadata:
-  name: lma-infra
-  clusterName: target-cluster
-config:
-  executorRef:
-    apiVersion: airshipit.org/v1alpha1
-    kind: KubernetesApply
-    name: kubernetes-apply
-  documentEntryPoint: target/lma-infra
---
-apiVersion: airshipit.org/v1alpha1
-kind: Phase
-metadata:
-  name: lma-stack
-  clusterName: target-cluster
-config:
-  executorRef:
-    apiVersion: airshipit.org/v1alpha1
-    kind: KubernetesApply
-    name: kubernetes-apply
-  documentEntryPoint: target/lma-stack
---
-apiVersion: airshipit.org/v1alpha1
-kind: Phase
-metadata:
-  name: lma-configs
-  clusterName: target-cluster
-config:
-  executorRef:
-    apiVersion: airshipit.org/v1alpha1
-    kind: KubernetesApply
-    name: kubernetes-apply
-  documentEntryPoint: target/lma-configs
--- a/manifests/type/airship-core/phases/workload-config.yaml
+++ b/manifests/type/airship-core/phases/workload-config.yaml
@ -0,0 +1,11 @@
+apiVersion: airshipit.org/v1alpha1
+kind: Phase
+metadata:
+  name: workload-config-target
+  clusterName: target-cluster
+config:
+  executorRef:
+    apiVersion: airshipit.org/v1alpha1
+    kind: KubernetesApply
+    name: kubernetes-apply
+  documentEntryPoint: target/workload-config
--- a/manifests/type/airship-core/target/workload-config/kustomization.yaml
+++ b/manifests/type/airship-core/target/workload-config/kustomization.yaml
@ -0,0 +1,8 @@
+resources:
+  - ../../../../function/lma-configs
+
+patches:
+  - path: patches/cluster-flow.yaml
+    target:
+      kind: ClusterFlow
+      name: all-pods
--- a/manifests/type/airship-core/target/workload-config/patches/cluster-flow.yaml
+++ b/manifests/type/airship-core/target/workload-config/patches/cluster-flow.yaml
@ -0,0 +1,6 @@
+- op: add
+  path: /spec/filters/-
+  value:
+    record_modifier:
+      records:
+        - airship-cluster: target
--- a/manifests/type/airship-core/target/workload-config/replacements/kustomization.yaml
+++ b/manifests/type/airship-core/target/workload-config/replacements/kustomization.yaml
@ -0,0 +1 @@
+resources: []
--- a/manifests/type/airship-core/target/workload/kustomization.yaml
+++ b/manifests/type/airship-core/target/workload/kustomization.yaml
@ -1,6 +1,19 @@
 resources:
  - ../../../../composite/storage-cluster
+  - ../../../../composite/lma-infra
+  - ../../../../composite/elastic-stack
+  - ../../../../composite/monitoring-stack
  - ../../../../function/ingress
  - ../../../../function/helm-chart-repository
  - ../../../../function/local-storage
  - dex-aio
+
+patches:
+  - patch: |-
+      - op: add
+        path: /spec/dependsOn
+        value:
+          - name: kube-prometheus-stack
+    target:
+      kind: HelmRelease
+      name: prometheus-elasticsearch-exporter
--- a/manifests/type/airship-core/target/workload/replacements/kustomization.yaml
+++ b/manifests/type/airship-core/target/workload/replacements/kustomization.yaml
@ -4,3 +4,6 @@ resources:
  - ../../../../../function/dex-aio/replacements
  - ../../../../../function/helm-chart-repository/replacements
  - ../../../../../function/local-storage/replacements
+  - ../../../../../composite/lma-infra/replacements
+  - ../../../../../composite/elastic-stack/replacements
+  - ../../../../../composite/monitoring-stack/replacements