Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync Flux to S3 bucket rather than GitHub repo [DO NOT MERGE] #152

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Sync Flux to S3 bucket rather than GitHub repo [DO NOT MERGE] #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 16 additions & 19 deletions solutions/oss/eks-infra/v3.0.0/iac/cdk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,31 +21,28 @@
"fluxRepository": {
"name": "grafana-dashboards",
"namespace": "grafana-operator",
"repository": {
"repoUrl": "https://github.com/aws-observability/observability-best-practices",
"name": "grafana-dashboards",
"targetRevision": "main",
"path": "./solutions/oss/eks-infra/v3.0.0/infrastructure"
},
"bucketName": "aws-observability-solutions",
"bucketRegion": "us-east-1",
"prefixPath": "EKS/OSS/CDK/v3.0.0",
"values": {
"GRAFANA_CLUSTER_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v3.0.0/grafana-dashboards/infrastructure/cluster.json",
"GRAFANA_KUBELET_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v3.0.0/grafana-dashboards/infrastructure/kubelet.json",
"GRAFANA_NSWRKLDS_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v3.0.0/grafana-dashboards/infrastructure/namespace-workloads.json",
"GRAFANA_NODEEXP_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v3.0.0/grafana-dashboards/infrastructure/nodeexporter-nodes.json",
"GRAFANA_NODES_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v3.0.0/grafana-dashboards/infrastructure/nodes.json",
"GRAFANA_WORKLOADS_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v3.0.0/grafana-dashboards/infrastructure/workloads.json",
"GRAFANA_FLEET_DASH_URL": "https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v3.0.0/grafana-dashboards/infrastructure/fleet-monitoring.json",
"GRAFANA_LOGS_DASH_URL": "https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v3.0.0/grafana-dashboards/infrastructure/logs.json",
"GRAFANA_APISERVER_BASIC_DASH_URL": "https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v3.0.0/grafana-dashboards/apiserver/apiserver-basic.json",
"GRAFANA_APISERVER_ADVANCED_DASH_URL": "https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v3.0.0/grafana-dashboards/apiserver/apiserver-advanced.json",
"GRAFANA_APISERVER_TROUBLESHOOTING_DASH_URL": "https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v3.0.0/grafana-dashboards/apiserver/apiserver-troubleshooting.json"
"GRAFANA_CLUSTER_DASH_URL" : "https://aws-observability-solutions.s3.amazonaws.com/EKS/OSS/CDK/v3.0.0/grafana-dashboards/infrastructure/cluster.json",
"GRAFANA_KUBELET_DASH_URL" : "https://aws-observability-solutions.s3.amazonaws.com/EKS/OSS/CDK/v3.0.0/grafana-dashboards/infrastructure/kubelet.json",
"GRAFANA_NSWRKLDS_DASH_URL" : "https://aws-observability-solutions.s3.amazonaws.com/EKS/OSS/CDK/v3.0.0/grafana-dashboards/infrastructure/namespace-workloads.json",
"GRAFANA_NODEEXP_DASH_URL" : "https://aws-observability-solutions.s3.amazonaws.com/EKS/OSS/CDK/v3.0.0/grafana-dashboards/infrastructure/nodeexporter-nodes.json",
"GRAFANA_NODES_DASH_URL" : "https://aws-observability-solutions.s3.amazonaws.com/EKS/OSS/CDK/v3.0.0/grafana-dashboards/infrastructure/nodes.json",
"GRAFANA_WORKLOADS_DASH_URL" : "https://aws-observability-solutions.s3.amazonaws.com/EKS/OSS/CDK/v3.0.0/grafana-dashboards/infrastructure/workloads.json",
"GRAFANA_FLEET_DASH_URL": "https://aws-observability-solutions.s3.amazonaws.com/EKS/OSS/CDK/v3.0.0/grafana-dashboards/infrastructure/fleet-monitoring.json",
"GRAFANA_LOGS_DASH_URL": "https://aws-observability-solutions.s3.amazonaws.com/EKS/OSS/CDK/v3.0.0/grafana-dashboards/infrastructure/logs.json",
"GRAFANA_APISERVER_BASIC_DASH_URL": "https://aws-observability-solutions.s3.amazonaws.com/EKS/OSS/CDK/v3.0.0/grafana-dashboards/apiserver/apiserver-basic.json",
"GRAFANA_APISERVER_ADVANCED_DASH_URL": "https://aws-observability-solutions.s3.amazonaws.com/EKS/OSS/CDK/v3.0.0/grafana-dashboards/apiserver/apiserver-advanced.json",
"GRAFANA_APISERVER_TROUBLESHOOTING_DASH_URL": "https://aws-observability-solutions.s3.amazonaws.com/EKS/OSS/CDK/v3.0.0/grafana-dashboards/apiserver/apiserver-troubleshooting.json"
},
"kustomizations": [
{
"kustomizationPath": "./solutions/oss/eks-infra/v3.0.0/infrastructure"
"kustomizationPath": "EKS/OSS/CDK/v3.0.0/infrastructure"
},
{
"kustomizationPath": "./solutions/oss/eks-infra/v3.0.0/apiserver"
"kustomizationPath": "EKS/OSS/CDK/v3.0.0/apiserver"
}
]
},
Expand Down
48 changes: 46 additions & 2 deletions ...tions/oss/eks-infra/v3.0.0/iac/lib/existing-eks-opensource-observability-pattern/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import * as eks from 'aws-cdk-lib/aws-eks';
import * as iam from 'aws-cdk-lib/aws-iam';
import { AmpClient, TagResourceCommand } from "@aws-sdk/client-amp";
import * as regionInfo from 'aws-cdk-lib/region-info';
import {PolicyDocument, PolicyStatement} from "aws-cdk-lib/aws-iam";
import {ICluster, ServiceAccount} from "aws-cdk-lib/aws-eks";

export default class ExistingEksOpenSourceobservabilityPattern {
async buildAsync(scope: cdk.App, _id: string) {
Expand Down Expand Up @@ -47,7 +49,7 @@ export default class ExistingEksOpenSourceobservabilityPattern {
});

// All Grafana Dashboard URLs from `cdk.json` if present
const fluxRepository: blueprints.FluxGitRepo = utils.valueFromContext(scope, "fluxRepository", undefined);
const fluxRepository: blueprints.FluxBucketRepo = utils.valueFromContext(scope, "fluxRepository", undefined);
fluxRepository.values!.AMG_AWS_REGION = region;
fluxRepository.values!.AMP_ENDPOINT_URL = ampEndpoint;
fluxRepository.values!.AMG_ENDPOINT_URL = amgEndpointUrl;
Expand Down Expand Up @@ -96,7 +98,7 @@ export default class ExistingEksOpenSourceobservabilityPattern {
new blueprints.KubeStateMetricsAddOn(),
new blueprints.MetricsServerAddOn(),
new blueprints.PrometheusNodeExporterAddOn(),
new blueprints.FluxCDAddOn({ "repositories": [fluxRepository] }),
new blueprints.FluxCDAddOn({ "buckets": [fluxRepository] }),
new blueprints.CloudWatchInsights(CloudWatchInsightsAddOnProps),
new GrafanaOperatorSecretAddon(),
];
Expand Down Expand Up @@ -128,6 +130,12 @@ export default class ExistingEksOpenSourceobservabilityPattern {
description: 'Deployed by AWS Managed OSS EKS Infrastructure Observability Solution'
});

const s3Policy = new iam.ManagedPolicy(stack, 'fluxCD-addon-managed-policy', {
document: s3ReadPolicy(fluxRepository.bucketName)
});

createS3ReadServiceAccountWithPolicy(obs.getClusterInfo().cluster, "source-controller", "flux-system", s3Policy)

new eks.CfnAccessEntry(stack, 'MyCfnAccessEntry', {
clusterName: clusterName,
principalArn: clusterRole.roleArn,
Expand Down Expand Up @@ -217,3 +225,39 @@ function getAmpWorkspaceEndpointFromArn(arn: string): string {

return `https://aps-workspaces.${ampRegion}.amazonaws.com/workspaces/${ampWorkspaceId}`;
}

export function s3ReadPolicy(bucketName: string): PolicyDocument {
return new PolicyDocument({
statements: [
new PolicyStatement({
actions: [
's3:ListBucket',
],
resources: ['arn:aws:s3:::'.concat(bucketName)]
}),
new PolicyStatement({
actions: [
's3:GetObject',
],
resources: ['arn:aws:s3:::'.concat(bucketName).concat("/*")]
})
]
});
}

export function createS3ReadServiceAccountWithPolicy(cluster: ICluster, name: string, namespace: string, ...policies: iam.IManagedPolicy[]): ServiceAccount {
const sa = cluster.addServiceAccount(`${name}-sa`, {
name: name,
namespace: namespace,
annotations: {
"meta.helm.sh/release-name": "blueprints-fluxcd-addon",
"meta.helm.sh/release-namespace": "flux-system"
},
labels: {
"app.kubernetes.io/managed-by": "Helm"
}
});

policies.forEach(policy => sa.role.addManagedPolicy(policy));
return sa;
}
Loading