Skip to content

Commit

Permalink
Merge pull request #853 from aws-quickstart/task/1.12.0-release-prep
Browse files Browse the repository at this point in the history
upgraded libraries, CDK set at 2.99.1, addon versions upgrades, core …
  • Loading branch information
shapirov103 committed Oct 6, 2023
2 parents 9db7c93 + 0f23151 commit b825f10
Show file tree
Hide file tree
Showing 30 changed files with 37 additions and 37 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ aws --version
Install CDK matching the current version of the Blueprints QuickStart (which can be found in package.json).

```bash
npm install -g aws-cdk@2.91.0
npm install -g aws-cdk@2.99.1
```

Verify the installation.

```bash
cdk --version
# must output 2.91.0
# must output 2.99.1
```

Create a new CDK project. We use `typescript` for this example.
Expand Down
4 changes: 2 additions & 2 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ aws --version
Install CDK matching the current version of the Blueprints QuickStart (which can be found in package.json).

```bash
npm install -g aws-cdk@2.91.0
npm install -g aws-cdk@2.99.1
```

Verify the installation.

```bash
cdk --version
# must output 2.91.0
# must output 2.99.1
```

Create a new CDK project. We use `typescript` for this example.
Expand Down
4 changes: 2 additions & 2 deletions docs/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ Create a directory that represents you project (e.g. `my-blueprints`) and then c
```bash
npm install -g n # may require sudo
n stable # may require sudo
npm install -g aws-cdk@2.91.0 # may require sudo (Ubuntu) depending on configuration
cdk --version # must produce 2.91.0
npm install -g aws-cdk@2.99.1 # may require sudo (Ubuntu) depending on configuration
cdk --version # must produce 2.99.1
mkdir my-blueprints
cd my-blueprints
cdk init app --language typescript
Expand Down
2 changes: 1 addition & 1 deletion docs/internal/ci.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ cd cdk-eks-blueprints
Install CDK (please review and install any missing [pre-requisites](https://docs.aws.amazon.com/cdk/latest/guide/getting_started.html) for your environment)

```sh
npm install -g aws-cdk@2.91.0
npm install -g aws-cdk@2.99.1
```

Install the dependencies for this project.
Expand Down
2 changes: 1 addition & 1 deletion lib/addons/adot/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export type AdotCollectorAddOnProps = Omit<CoreAddOnProps, "saName" | "addOnName

const defaultProps = {
addOnName: 'adot',
version: 'v0.78.0-eksbuild.1',
version: 'v0.80.0-eksbuild.2',
saName: 'adot-collector',
policyDocumentProvider: getAdotCollectorPolicyDocument,
namespace: 'default'
Expand Down
2 changes: 1 addition & 1 deletion lib/addons/apache-airflow/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ const AIRFLOWPVC = 'efs-apache-airflow-pvc';
name: AIRFLOW,
namespace: AIRFLOW,
chart: AIRFLOW,
version: "1.10.0",
version: "1.11.0",
release: RELEASE,
repository: "https://airflow.apache.org",
enableAlb: false,
Expand Down
2 changes: 1 addition & 1 deletion lib/addons/appmesh/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const defaultProps = {
name: "appmesh-controller",
namespace: "appmesh-system",
chart: "appmesh-controller",
version: "1.12.2",
version: "1.12.3",
release: "appmesh-release",
repository: "https://aws.github.io/eks-charts"
};
Expand Down
2 changes: 1 addition & 1 deletion lib/addons/argocd/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export interface ArgoCDAddOnProps extends HelmAddOnUserProps {
*/
const defaultProps = {
namespace: "argocd",
version: '5.43.4',
version: '5.46.7',
chart: "argo-cd",
release: "blueprints-addon-argocd",
repository: "https://argoproj.github.io/argo-helm"
Expand Down
2 changes: 1 addition & 1 deletion lib/addons/aws-for-fluent-bit/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const defaultProps: AwsForFluentBitAddOnProps = {
name: 'fluent-bit',
chart: 'aws-for-fluent-bit',
release: "blueprints-addon-aws-for-fluent-bit",
version: '0.1.28',
version: '0.1.30',
repository: 'https://aws.github.io/eks-charts',
namespace: 'kube-system',
createNamespace: false,
Expand Down
2 changes: 1 addition & 1 deletion lib/addons/aws-loadbalancer-controller/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const defaultProps: AwsLoadBalancerControllerProps = {
chart: AWS_LOAD_BALANCER_CONTROLLER,
repository: 'https://aws.github.io/eks-charts',
release: AWS_LOAD_BALANCER_CONTROLLER,
version: '1.6.0',
version: '1.6.1',
enableShield: false,
enableWaf: false,
enableWafv2: false,
Expand Down
2 changes: 1 addition & 1 deletion lib/addons/calico-operator/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export interface CalicoOperatorAddOnProps extends HelmAddOnUserProps {
const defaultProps = {
name: 'calico-operator',
namespace: 'calico-operator',
version: 'v3.26.1',
version: 'v3.26.2',
chart: "tigera-operator",
release: "bp-addon-calico-operator",
repository: "https://projectcalico.docs.tigera.io/charts"
Expand Down
2 changes: 1 addition & 1 deletion lib/addons/cert-manager/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const defaultProps: HelmAddOnProps & CertManagerAddOnProps = {
name: "blueprints-cert-manager-addon",
namespace: "cert-manager",
chart: "cert-manager",
version: "1.12.3",
version: "1.13.1",
release: "cert-manager",
repository: "https://charts.jetstack.io",
values: {},
Expand Down
2 changes: 1 addition & 1 deletion lib/addons/cloudwatch-logs/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const defaultProps: CloudWatchLogsAddonProps = {
name: 'aws-for-fluent-bit',
chart: 'aws-for-fluent-bit',
release: "blueprints-addon-aws-fluent-bit-for-cw",
version: '0.1.28',
version: '0.1.30',
repository: 'https://aws.github.io/eks-charts',
namespace: 'aws-for-fluent-bit',
createNamespace: true,
Expand Down
2 changes: 1 addition & 1 deletion lib/addons/coredns/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export type CoreDnsAddOnProps = Omit<CoreAddOnProps, "saName" | "addOnName">;

const defaultProps = {
addOnName: 'coredns',
version: 'v1.10.1-eksbuild.2',
version: 'v1.10.1-eksbuild.4',
saName: 'coredns',
configurationValues: {}
};
Expand Down
2 changes: 1 addition & 1 deletion lib/addons/ebs-csi-driver/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export interface EbsCsiDriverAddOnProps {
*/
const defaultProps = {
addOnName: "aws-ebs-csi-driver",
version: "v1.21.0-eksbuild.1",
version: "v1.23.0-eksbuild.1",
saName: "ebs-csi-controller-sa",
};

Expand Down
2 changes: 1 addition & 1 deletion lib/addons/efs-csi-driver/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export interface EfsCsiDriverProps extends HelmAddOnUserProps {
* Defaults options for the add-on
*/
const defaultProps: EfsCsiDriverProps = {
version: '2.4.9',
version: '2.5.0',
namespace: "kube-system",
repository: "https://kubernetes-sigs.github.io/aws-efs-csi-driver/",
name: EFS_CSI_DRIVER,
Expand Down
2 changes: 1 addition & 1 deletion lib/addons/external-dns/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const defaultProps = {
namespace: 'external-dns',
repository: 'https://kubernetes-sigs.github.io/external-dns/',
release: 'blueprints-addon-external-dns',
version: '1.13.0',
version: '1.13.1',
values: {},
};

Expand Down
2 changes: 1 addition & 1 deletion lib/addons/external-secrets/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const defaultProps: ExternalsSecretsAddOnProps = {
name: "external-secrets",
chart: "external-secrets",
release: "blueprints-addon-external-secrets",
version: "0.9.3",
version: "0.9.5",
repository: "https://charts.external-secrets.io",
namespace: "external-secrets",
values: {},
Expand Down
2 changes: 1 addition & 1 deletion lib/addons/fluxcd/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ const defaultProps: HelmAddOnProps & FluxCDAddOnProps = {
name: "fluxcd-addon",
namespace: "flux-system",
chart: "flux2",
version: "2.9.2",
version: "2.10.1",
release: "blueprints-fluxcd-addon",
repository: "https://fluxcd-community.github.io/helm-charts",
values: {},
Expand Down
2 changes: 1 addition & 1 deletion lib/addons/gpu-operator/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const defaultProps: HelmAddOnProps & GpuOperatorAddonProps = {
name: "gpu-operator-addon",
namespace: "gpu-operator",
chart: "gpu-operator",
version: "v23.6.0",
version: "v23.6.1",
release: "nvidia-gpu-operator",
repository: "https://helm.ngc.nvidia.com/nvidia",
createNamespace: true,
Expand Down
2 changes: 1 addition & 1 deletion lib/addons/grafana-operator/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const defaultProps: HelmAddOnProps & GrafanaOperatorAddonProps = {
chart: 'oci://ghcr.io/grafana-operator/helm-charts/grafana-operator',
namespace: 'grafana-operator',
release: 'grafana-operator',
version: 'v5.0.0-rc3',
version: 'v5.4.0',
values: {},
createNamespace: true
};
Expand Down
2 changes: 1 addition & 1 deletion lib/addons/istio-base/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const defaultProps = {
release: "istio-base",
namespace: "istio-system",
chart: "base",
version: "1.18.2",
version: "1.19.1",
repository: "https://istio-release.storage.googleapis.com/charts"
};

Expand Down
2 changes: 1 addition & 1 deletion lib/addons/istio-control-plane/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const defaultProps = {
release: "istiod",
namespace: "istio-system",
chart: "istiod",
version: "1.18.2",
version: "1.19.1",
repository: "https://istio-release.storage.googleapis.com/charts"
};

Expand Down
2 changes: 1 addition & 1 deletion lib/addons/karpenter/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ const RELEASE = 'blueprints-addon-karpenter';
const defaultProps: HelmAddOnProps = {
name: KARPENTER,
namespace: KARPENTER,
version: 'v0.29.2',
version: 'v0.31.0',
chart: KARPENTER,
release: KARPENTER,
repository: 'oci://public.ecr.aws/karpenter/karpenter',
Expand Down
2 changes: 1 addition & 1 deletion lib/addons/keda/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ const defaultProps: HelmAddOnProps & KedaAddOnProps = {
name: "blueprints-keda-addon",
chart: "keda",
namespace:"keda",
version: "2.11.2",
version: "2.12.0",
release: "keda",
repository: "https://kedacore.github.io/charts",
values: {},
Expand Down
2 changes: 1 addition & 1 deletion lib/addons/kube-state-metrics/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const defaultProps: HelmAddOnProps & KubeStateMetricsAddOnProps = {
name: "kube-state-metrics",
namespace: "kube-system",
chart: "kube-state-metrics",
version: "5.10.1",
version: "5.14.0",
release: "kube-state-metrics",
repository: "https://prometheus-community.github.io/helm-charts",
values: {},
Expand Down
2 changes: 1 addition & 1 deletion lib/addons/nginx/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ const defaultProps: NginxAddOnProps = {
name: "nginx-ingress",
chart: "nginx-ingress",
release: "blueprints-addon-nginx",
version: "0.18.1",
version: "1.0.0",
repository: "https://helm.nginx.com/stable",
backendProtocol: 'tcp',
crossZoneEnabled: true,
Expand Down
2 changes: 1 addition & 1 deletion lib/addons/prometheus-node-exporter/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const defaultProps: HelmAddOnProps & PrometheusNodeExporterAddOnProps = {
name: "prometheus-node-exporter",
namespace: "prometheus-node-exporter",
chart: "prometheus-node-exporter",
version: "4.22.0",
version: "4.23.2",
release: "prometheus-node-exporter",
repository: "https://prometheus-community.github.io/helm-charts",
values: {},
Expand Down
2 changes: 1 addition & 1 deletion lib/pipelines/code-pipeline.ts
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ class CodePipeline {
input: codePipelineSource,
installCommands: [
'n stable',
'npm install -g aws-cdk@2.91.0',
'npm install -g aws-cdk@2.99.1',
`cd ${path} && npm install`,
],
commands: [`cd ${path}`, 'npm run build', 'npx cdk synth ' + app]
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aws-quickstart/eks-blueprints",
"version": "1.11.3",
"version": "1.12.0",
"license": "Apache-2.0",
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand All @@ -26,16 +26,16 @@
"@types/uuid": "^9.0.1",
"@typescript-eslint/eslint-plugin": "^6.4.0",
"@typescript-eslint/parser": "^6.4.0",
"aws-cdk": "2.91.0",
"aws-cdk": "2.99.1",
"copyfiles": "^2.4.1",
"eslint": "^8.38.0",
"jest": "^29.6.2",
"json-schema-to-typescript": "^13.0.1",
"lint": "^1.1.2",
"ts-jest": "^29.1.0",
"ts-node": "^10.9.1",
"typedoc": "^0.24.4",
"typescript": "^5.0.4"
"typedoc": "^0.25.1",
"typescript": "^5.2.2"
},
"dependencies": {
"@aws-cdk/lambda-layer-kubectl-v25": "^2.0.3",
Expand All @@ -47,7 +47,7 @@
"@types/bcrypt": "^5.0.0",
"@types/lodash.clonedeep": "^4.5.7",
"@types/uuid": "^9.0.1",
"aws-cdk-lib": "2.91.0",
"aws-cdk-lib": "2.99.1",
"bcrypt": "^5.1.1",
"constructs": "^10.2.33",
"dot-object": "^2.1.4",
Expand Down

0 comments on commit b825f10

Please sign in to comment.