diff --git a/install.sh b/install.sh index ec9bdaa..ce3b8be 100644 --- a/install.sh +++ b/install.sh @@ -411,8 +411,8 @@ validate_opensearch_password() { } +echo "Do you want to push logs to S3 and Open Search? [y/n]: " while true; do - echo "Do you want to push logs to S3 and Open Search? [y/n]: " read -r OPEN_SEARCH_SERVICE if [[ "$OPEN_SEARCH_SERVICE" == "y" ]]; then diff --git a/lib/aws/eks.ts b/lib/aws/eks.ts index 02acd2e..823f0d7 100644 --- a/lib/aws/eks.ts +++ b/lib/aws/eks.ts @@ -1223,7 +1223,8 @@ export class EksStack { value: { [`${provider.openIdConnectProviderIssuer}:aud`]: "sts.amazonaws.com", [`${provider.openIdConnectProviderIssuer}:sub`]: - ["system:serviceaccount:loki:loki-grafana" + ["system:serviceaccount:loki:loki-grafana", + "system:serviceaccount:loki:loki" ] }, }); @@ -1302,13 +1303,13 @@ export class EksStack { }), ); - const loki_ns = cluster.addManifest("loki-ns", { - "apiVersion": "v1", - "kind": "Namespace", - "metadata": { - "name": "loki" - } - }); + // const loki_ns = cluster.addManifest("loki-ns", { + // "apiVersion": "v1", + // "kind": "Namespace", + // "metadata": { + // "name": "loki" + // } + // }); // const lokiSA = cluster.addServiceAccount("loki-sa", { // namespace: "loki" @@ -1441,7 +1442,6 @@ export class EksStack { }, }); - lokiChart.node.addDependency(loki_ns); lokiChart.node.addDependency(hypersChart); this.lokiChart = lokiChart;