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.

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

packages: normalize amazon-ecs-cni-plugins version to 2020.09.0 #277

Merged

Conversation

ginglis13
Copy link
Contributor

@ginglis13 ginglis13 commented Nov 16, 2024

Issue number:

Closes #249

Description of changes:

Normalize the versioning of the amazon-ecs-cni-plugins package by using its VERSION provided in the upstream. Add an Epoch of 1 to account for past packages using a gitrev for Version.

Testing done:

Build a dev core kit, launch an aws-ecs-2 variant:

bash-5.1# ls -l /usr/libexec/amazon-ecs-agent/
total 4
lrwxrwxrwx. 1 root root   22 Nov 13 22:52 aws-appmesh -> ../cni/vpc/aws-appmesh
lrwxrwxrwx. 1 root root   21 Nov 15 23:40 ecs-bridge -> ../cni/ecs/ecs-bridge
lrwxrwxrwx. 1 root root   18 Nov 15 23:40 ecs-eni -> ../cni/ecs/ecs-eni
lrwxrwxrwx. 1 root root   19 Nov 15 23:40 ecs-ipam -> ../cni/ecs/ecs-ipam
lrwxrwxrwx. 1 root root   29 Nov 13 22:52 ecs-serviceconnect -> ../cni/vpc/ecs-serviceconnect
drwxr-xr-x. 3 root root 4096 Nov 16 00:42 managed-agents
lrwxrwxrwx. 1 root root   25 Nov 13 22:52 vpc-branch-eni -> ../cni/vpc/vpc-branch-eni
lrwxrwxrwx. 1 root root   21 Nov 13 22:52 vpc-bridge -> ../cni/vpc/vpc-bridge
lrwxrwxrwx. 1 root root   18 Nov 13 22:52 vpc-eni -> ../cni/vpc/vpc-eni
lrwxrwxrwx. 1 root root   21 Nov 13 22:52 vpc-tunnel -> ../cni/vpc/vpc-tunnel

bash-5.1# systemctl status ecs
● ecs.service - Amazon Elastic Container Service - container agent
     Loaded: loaded (/x86_64-bottlerocket-linux-gnu/sys-root/usr/lib/systemd/system/ecs.service; enabled; preset: enabled)
    Drop-In: /x86_64-bottlerocket-linux-gnu/sys-root/usr/lib/systemd/system/service.d
             └─00-aws-config.conf
             /x86_64-bottlerocket-linux-gnu/sys-root/usr/lib/systemd/system/ecs.service.d
             └─00-defaults.conf
             /etc/systemd/system/ecs.service.d
             └─10-base.conf
     Active: active (running) since Sat 2024-11-16 00:46:23 UTC; 8min ago
       Docs: https://aws.amazon.com/documentation/ecs/
   Main PID: 1367 (amazon-ecs-agen)
      Tasks: 9 (limit: 2250)
     Memory: 80.7M
        CPU: 425ms
     CGroup: /system.slice/ecs.service
             └─1367 /usr/bin/amazon-ecs-agent
  • Internal testing for aws-ecs-2 variant succeeds.

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

Normalize the versioning of the amazon-ecs-cni-plugins package by using
its VERSION provided in the upstream. Add an Epoch of 1 to account for
past packages using a gitrev for Version.

Signed-off-by: Gavin Inglis <[email protected]>
@ginglis13 ginglis13 force-pushed the normalize-cni-plugins-version branch from d8b7506 to 2ebdefe Compare November 21, 2024 16:11
@ginglis13 ginglis13 requested a review from bcressey November 21, 2024 16:11
@ginglis13 ginglis13 changed the title packages: update amazon-ecs-cni-plugins to 2024.09.0 packages: normalize amazon-ecs-cni-plugins version 2020.09.0 Nov 21, 2024
@ginglis13 ginglis13 changed the title packages: normalize amazon-ecs-cni-plugins version 2020.09.0 packages: normalize amazon-ecs-cni-plugins version to 2020.09.0 Nov 21, 2024
@ginglis13 ginglis13 merged commit be3e3b7 into bottlerocket-os:develop Nov 22, 2024
2 checks passed
@ytsssun ytsssun mentioned this pull request Dec 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Normalize the amazon-ecs-cni-plugins package Version
4 participants