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

Jump to bottom

chore(merge-back): 1.64.1 #10544

Merged
merged 6 commits into from
Sep 25, 2020
Merged

chore(merge-back): 1.64.1 #10544

merged 6 commits into from
Sep 25, 2020

Commits on Sep 25, 2020

  1. fix(eks): KubernetesPatch and FargateCluster creates a circular d… 

    …ependency and breaks deployment (#10536)

In version [`1.62.0`](https://github.com/aws/aws-cdk/releases/tag/v1.62.0) we introduced the ability to run `kubectl` commands on imported clusters. (See #9802).

Part of this change included some refactoring with regards to how we use and create the `KubectlProvider`.
Looks like we didn't consistently apply the same logic across all constructs that use it.

Case in point:

https://github.com/aws/aws-cdk/blob/e349004a522e2123c1e93bd3402dd7c3f9c5c17c/packages/%40aws-cdk/aws-eks/lib/k8s-manifest.ts#L58

Notice that here we use `this` as the scope to the `getOrCreate` call. Same goes for:

https://github.com/aws/aws-cdk/blob/e349004a522e2123c1e93bd3402dd7c3f9c5c17c/packages/%40aws-cdk/aws-eks/lib/k8s-object-value.ts#L64

However, `KubernetesPatch` use `scope` instead.

https://github.com/aws/aws-cdk/blob/e349004a522e2123c1e93bd3402dd7c3f9c5c17c/packages/%40aws-cdk/aws-eks/lib/k8s-patch.ts#L74

This means that the entire `scope` of the `KubernetesPatch` now depends, among others, on the `kubectlBarrier`. 
The scope will usually be either the cluster itself (when using `FargateCluster`), or the entire stack (when using `new KubernetesPatch`). In any case, the scope will most likely contain the cluster VPC.

This creates the following dependency cycle: `Cluster => ClusterVpc => KubectlBarrier => Cluster`.

The fix aligns the `KubernetesPatch` behavior to all other `kubectl` constructs and uses `this` as the scope, which will only add dependency on the barrier to the custom resource representing the patch.

Fixes #10528
Fixes #10537

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
    @iliapolo
    iliapolo committed Sep 25, 2020
    Configuration menu
    Copy the full SHA
    f0f8a63 View commit details
    Browse the repository at this point in the history

  2. chore(release): 1.64.1

    @iliapolo
    iliapolo committed Sep 25, 2020
    Configuration menu
    Copy the full SHA
    c0602d7 View commit details
    Browse the repository at this point in the history

  3. Fix CHANGELOG header

    @iliapolo
    iliapolo committed Sep 25, 2020
    Configuration menu
    Copy the full SHA
    423d704 View commit details
    Browse the repository at this point in the history

  4. Fix CHANGELOG entry corruption

    @iliapolo
    iliapolo committed Sep 25, 2020
    Configuration menu
    Copy the full SHA
    10c7b49 View commit details
    Browse the repository at this point in the history

  5. chore(release): 1.64.1 (#10541) 

    See [CHANGELOG](https://github.com/aws/aws-cdk/blob/patch/v1.64.1/CHANGELOG.md)

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
    @mergify
    mergify[bot] authored Sep 25, 2020
    Configuration menu
    Copy the full SHA
    14a8c8d View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into merge-back/1.64.1

    @iliapolo
    iliapolo authored Sep 25, 2020
    Configuration menu
    Copy the full SHA
    5223957 View commit details
    Browse the repository at this point in the history