Skip to content

Commit

Permalink
fix: bump min cdk version to 2.28.0 to use node 14 (backport #300) (#312
Browse files Browse the repository at this point in the history
)

This is an automatic backport of pull request #300 done by [Mergify](https://mergify.com).
Cherry-pick of 511e534 has failed:
```
On branch mergify/bp/kubectl-v26/main/pr-300
Your branch is up to date with 'origin/kubectl-v26/main'.

You are currently cherry-picking commit 511e534.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .gitattributes
	modified:   .gitignore
	new file:   .gitpod.yml
	modified:   .projen/deps.json
	modified:   .projen/files.json
	modified:   .projenrc.ts
	modified:   CONTRIBUTING.md
	modified:   package.json
	modified:   yarn.lock

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   API.md
	both modified:   test/kubectl-layer.integ.snapshot/lambda-layer-kubectl-integ-stack.assets.json
	both modified:   test/kubectl-layer.integ.snapshot/lambda-layer-kubectl-integ-stack.template.json

```


To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

---


<details>
<summary>Mergify commands and options</summary>

<br />

More conditions and actions can be found in the [documentation](https://docs.mergify.com/).

You can also trigger Mergify actions by commenting on this pull request:

- `@Mergifyio refresh` will re-evaluate the rules
- `@Mergifyio rebase` will rebase this PR on its base branch
- `@Mergifyio update` will merge the base branch into this PR
- `@Mergifyio backport <destination>` will backport this PR on `<destination>` branch

Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you can:

- look at your merge queues
- generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com
</details>
  • Loading branch information
mergify[bot] committed Jun 14, 2023
1 parent 219b341 commit ae4eaf3
Show file tree
Hide file tree
Showing 12 changed files with 432 additions and 380 deletions.
1 change: 1 addition & 0 deletions .gitattributes

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .gitpod.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .projen/deps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .projen/files.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 12 additions & 2 deletions .projenrc.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { awscdk } from 'projen';
import { awscdk, Gitpod, DevEnvironmentDockerImage } from 'projen';
import { NpmAccess } from 'projen/lib/javascript';
import { WorkflowNoDockerPatch } from './projenrc/workflow-no-docker-patch';

Expand All @@ -11,7 +11,7 @@ const project = new awscdk.AwsCdkConstructLibrary({
projenrcTs: true,
author: 'Amazon Web Services',
authorAddress: 'aws-cdk-dev@amazon.com',
cdkVersion: '2.0.0',
cdkVersion: '2.28.0',
name: `@aws-cdk/lambda-layer-kubectl-v${SPEC_VERSION}`,
description: `A Lambda Layer that contains kubectl v1.${SPEC_VERSION}`,
repositoryUrl: 'https://github.com/cdklabs/awscdk-asset-kubectl.git',
Expand Down Expand Up @@ -73,4 +73,14 @@ new WorkflowNoDockerPatch(project, { workflow: 'release', workflowName: `release

project.preCompileTask.exec('layer/build.sh');

// For gitpod users, use jsii/superchain as the dockerImage for the workspace.
const gitpod = new Gitpod(project, {
dockerImage: DevEnvironmentDockerImage.fromImage('public.ecr.aws/jsii/superchain:1-buster-slim-node18'),
});

gitpod.addVscodeExtensions(
'dbaeumer.vscode-eslint',
'AmazonWebServices.aws-toolkit-vscode',
);

project.synth();
18 changes: 9 additions & 9 deletions API.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ in the corresponding go binding repository, [`cdklabs/awscdk-kubectl-go`](https:
For example, if `KUBECTL_VERSION` is v1.25.0, then `SPEC_VERSION` should be 25.
- for an example of code changes done for kubectl v1.22.0, see this [PR](https://github.com/cdklabs/awscdk-asset-kubectl/pull/7).
5. Run `npx projen` to update the github workflows.
6. Run `yarn:integ:kubectl-asset:deploy` to ensure that the new versions in the Dockerfile can be successfully downloaded.
Run `yarn:integ:kubectl-asset:snapshot` if `deploy` succeeds and the snapshot does not get updated.
6. Run `npx projen integ:kubectl-layer:deploy` to ensure that the new versions in the Dockerfile can be successfully downloaded.
Run `npx projen integ:kubectl-layer:snapshot` if `deploy` succeeds and the snapshot does not get updated.
7. Run `yarn build` to ensure everything builds correctly.
8. Commit to your fork and submit a pull request to the repository, _ensuring that you are targeting the correct `kubectl-vY/main` branch_.
9. A maintainer will review your contribution from there!
Expand Down
4 changes: 2 additions & 2 deletions package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "15.0.0",
"version": "20.0.0",
"files": {
"2873922b2920bdb6f113a1deaf12a0572a881113a1d89d7b328db438adead07f": {
"source": {
Expand Down Expand Up @@ -27,28 +27,28 @@
}
}
},
"c691172cdeefa2c91b5a2907f9d81118e47597634943344795f1a844192dd49c": {
"eaeb69bc290b516fe3b049f89d6118b22249df682fbabf56af300cf345198574": {
"source": {
"path": "asset.c691172cdeefa2c91b5a2907f9d81118e47597634943344795f1a844192dd49c",
"path": "asset.eaeb69bc290b516fe3b049f89d6118b22249df682fbabf56af300cf345198574",
"packaging": "zip"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "c691172cdeefa2c91b5a2907f9d81118e47597634943344795f1a844192dd49c.zip",
"objectKey": "eaeb69bc290b516fe3b049f89d6118b22249df682fbabf56af300cf345198574.zip",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
},
"928de8aafe54b4eda6c867108540aa9f1a784e5f6509cb48d5f78f582c1568dd": {
"0b69bec8c78e63abd08d634a0f862061ca7bdffb79e064ee777250c67bcdd9d0": {
"source": {
"path": "lambda-layer-kubectl-integ-stack.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "928de8aafe54b4eda6c867108540aa9f1a784e5f6509cb48d5f78f582c1568dd.json",
"objectKey": "0b69bec8c78e63abd08d634a0f862061ca7bdffb79e064ee777250c67bcdd9d0.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down
Loading

0 comments on commit ae4eaf3

Please sign in to comment.