diff --git a/manifests/composite/elastic-stack/patches/kibana.yaml b/manifests/composite/elastic-stack/patches/kibana.yaml index 95cd933e5..0ed68bdde 100644 --- 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 diff --git a/manifests/composite/lma-infra/patches/kube-prometheus-stack.yaml b/manifests/composite/lma-infra/patches/kube-prometheus-stack.yaml index d48637dad..6663137e3 100644 --- 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: diff --git a/manifests/function/lma-configs/logging/flows/cluster-flow-all.yaml b/manifests/function/lma-configs/logging/flows/cluster-flow-all.yaml index e419279f5..5c54a6813 100644 --- 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 diff --git a/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml b/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml index 3324474a0..e9ad90d76 100644 --- 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 diff --git a/manifests/site/reference-airship-core/target/lma-configs/kustomization.yaml b/manifests/site/reference-airship-core/target/lma-configs/kustomization.yaml deleted file mode 100644 index 30e4a4f53..000000000 --- a/manifests/site/reference-airship-core/target/lma-configs/kustomization.yaml +++ /dev/null @@ -1,4 +0,0 @@ -resources: - - ../../../../function/lma-configs - -namespace: lma \ No newline at end of file diff --git a/manifests/site/reference-airship-core/target/lma-infra/kustomization.yaml b/manifests/site/reference-airship-core/target/lma-infra/kustomization.yaml deleted file mode 100644 index 8f84ec12a..000000000 --- a/manifests/site/reference-airship-core/target/lma-infra/kustomization.yaml +++ /dev/null @@ -1,9 +0,0 @@ -resources: - - ../../../../composite/lma-infra - - ../catalogues - - lma-infra-object-store.yaml - -transformers: - - ../../../../composite/lma-infra/replacements - -namespace: lma diff --git a/manifests/site/reference-airship-core/target/lma-stack/kustomization.yaml b/manifests/site/reference-airship-core/target/lma-stack/kustomization.yaml deleted file mode 100644 index f736c402a..000000000 --- a/manifests/site/reference-airship-core/target/lma-stack/kustomization.yaml +++ /dev/null @@ -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 diff --git a/manifests/site/reference-airship-core/target/workload-config/kustomization.yaml b/manifests/site/reference-airship-core/target/workload-config/kustomization.yaml new file mode 100644 index 000000000..3b86edecf --- /dev/null +++ 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 \ No newline at end of file diff --git a/manifests/site/test-site/target/workload-config/kustomization.yaml b/manifests/site/test-site/target/workload-config/kustomization.yaml new file mode 100644 index 000000000..51c828d3a --- /dev/null +++ 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 diff --git a/manifests/type/airship-core/phases/kustomization.yaml b/manifests/type/airship-core/phases/kustomization.yaml index 1428b8ad2..aebbd5520 100644 --- 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 diff --git a/manifests/type/airship-core/phases/lma-infra-target.yaml b/manifests/type/airship-core/phases/lma-infra-target.yaml deleted file mode 100644 index ce8e79c53..000000000 --- a/manifests/type/airship-core/phases/lma-infra-target.yaml +++ /dev/null @@ -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 diff --git a/manifests/type/airship-core/phases/workload-config.yaml b/manifests/type/airship-core/phases/workload-config.yaml new file mode 100644 index 000000000..f213c7fca --- /dev/null +++ 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 diff --git a/manifests/type/airship-core/target/workload-config/kustomization.yaml b/manifests/type/airship-core/target/workload-config/kustomization.yaml new file mode 100644 index 000000000..98abc7a88 --- /dev/null +++ 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 diff --git a/manifests/type/airship-core/target/workload-config/patches/cluster-flow.yaml b/manifests/type/airship-core/target/workload-config/patches/cluster-flow.yaml new file mode 100644 index 000000000..ca9ae59f6 --- /dev/null +++ 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 diff --git a/manifests/type/airship-core/target/workload-config/replacements/kustomization.yaml b/manifests/type/airship-core/target/workload-config/replacements/kustomization.yaml new file mode 100644 index 000000000..b7398e9e5 --- /dev/null +++ b/manifests/type/airship-core/target/workload-config/replacements/kustomization.yaml @@ -0,0 +1 @@ +resources: [] \ No newline at end of file diff --git a/manifests/type/airship-core/target/workload/kustomization.yaml b/manifests/type/airship-core/target/workload/kustomization.yaml index 3cd83edca..550b932b1 100644 --- 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 diff --git a/manifests/type/airship-core/target/workload/replacements/kustomization.yaml b/manifests/type/airship-core/target/workload/replacements/kustomization.yaml index f782ff976..76c5bf7c1 100644 --- 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