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

3p packages update 1.15.0 #3362

Merged
merged 27 commits into from
Aug 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
93da1cb
packages: update amazon-ssm-agent to 3.2.1478.0
vyaghras Aug 24, 2023
6a79bb5
packages: update aws-iam-authenticator to 0.6.11
vyaghras Aug 24, 2023
e714e7f
packages: update chrony to 4.4
vyaghras Aug 24, 2023
fd1fd35
packages: update containerd to 1.6.23
vyaghras Aug 24, 2023
2ec6f1f
packages: update ethtool to 6.4
vyaghras Aug 24, 2023
02fa6c0
packages: update iproute to 6.4.0
vyaghras Aug 24, 2023
0c2bdea
packages: update libaudit to 3.1.2
vyaghras Aug 24, 2023
b157e7f
packages: update libcap to 2.69
vyaghras Aug 24, 2023
691ff19
packages: update libdbus to 1.15.6
vyaghras Aug 24, 2023
2c75f05
packages: update libinih to 57
vyaghras Aug 24, 2023
855e472
packages: update liblzma to 5.4.4
vyaghras Aug 24, 2023
74168c4
packages: update libnftnl to 1.2.6
vyaghras Aug 24, 2023
e34c7f4
packages: update libnvidia-container to 1.13.5
vyaghras Aug 24, 2023
f62c33e
packages: update libxcrypt to 4.4.36
vyaghras Aug 24, 2023
dd28a52
packages: update libz to 1.3
vyaghras Aug 24, 2023
d04fde9
packages: update nvidia-container-toolkit to 1.13.5
vyaghras Aug 24, 2023
9ea34db
packages: update nvidia-k8s-device-plugin to 0.14.1
vyaghras Aug 24, 2023
7d65553
packages: update pigz to 2.8
vyaghras Aug 24, 2023
4c0a71c
packages: update xfsprogs to 6.4.0
vyaghras Aug 24, 2023
176e6f2
packages: update ca-certificates to 2023-08-22
vyaghras Aug 24, 2023
7295f7b
packages: update open-vm-tools to 12.2.5
vyaghras Aug 24, 2023
40d3b6e
packages: update ecs-agent to 1.75.0
vyaghras Aug 23, 2023
433f833
packages: update libglib to 2.77.2
vyaghras Aug 24, 2023
203a0ca
packages: update strace to 6.4
vyaghras Aug 24, 2023
1589ed4
packages: update util-linux to 2.39.2
vyaghras Aug 24, 2023
b9dbeb6
packages:update runc to 1.1.9
vyaghras Aug 24, 2023
1f0e2cc
packages: update cni-plugins to 1.3.0
vyaghras Aug 24, 2023
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
4 changes: 2 additions & 2 deletions packages/amazon-ssm-agent/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ build = "../build.rs"
path = "../packages.rs"

[[package.metadata.build-package.external-files]]
url = "https://github.com/aws/amazon-ssm-agent/archive/3.2.815.0/amazon-ssm-agent-3.2.815.0.tar.gz"
sha512 = "724b659f7141dc9c797288f109b35c2a516f08f843d472da0d44f1a04c5fbce30fd8df0cde95be355ca2a710b146c89e1ee3bb5905c297a90b3aaccf78d9da8b"
url = "https://github.com/aws/amazon-ssm-agent/archive/3.2.1478.0/amazon-ssm-agent-3.2.1478.0.tar.gz"
sha512 = "f9a4741784a861ab8319793d37baee57137aa2eb6a350df329d8dee0c00a97c6e639560eb0c17d4bb596ddc032ee36819fbc40b55f559c490a3eb214e9627ba1"

[build-dependencies]
glibc = { path = "../glibc" }
2 changes: 1 addition & 1 deletion packages/amazon-ssm-agent/amazon-ssm-agent.spec
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
%global goimport %{goproject}/%{gorepo}

Name: %{_cross_os}amazon-ssm-agent
Version: 3.2.815.0
Version: 3.2.1478.0
Release: 1%{?dist}
Summary: An agent to enable remote management of EC2 instances
License: Apache-2.0
Expand Down
4 changes: 2 additions & 2 deletions packages/aws-iam-authenticator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ path = "../packages.rs"
releases-url = "https://github.com/kubernetes-sigs/aws-iam-authenticator/releases"

[[package.metadata.build-package.external-files]]
url = "https://github.com/kubernetes-sigs/aws-iam-authenticator/archive/v0.6.8/aws-iam-authenticator-0.6.8.tar.gz"
sha512 = "6e9f43852cdd3fb7d47ea70df5d108a0e235245b6db1a4f6406efffc329f5c940bf284c216e4bf20e83ff691b078652cee3fbae4c7c3da658ea3eef2ecab92b5"
url = "https://github.com/kubernetes-sigs/aws-iam-authenticator/archive/v0.6.11/aws-iam-authenticator-0.6.11.tar.gz"
sha512 = "6d78fbe95d6e36a7a3835b4df257e96fff3ab53fe4abd8ef525c24aebaf8727e2a6016107024bebe031b2e24295172190407ca892d1b3478329c62cdd9fe553f"
bundle-modules = [ "go" ]

[build-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-iam-authenticator/aws-iam-authenticator.spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%global gorepo aws-iam-authenticator
%global goimport %{goproject}/%{gorepo}

%global gover 0.6.8
%global gover 0.6.11
%global rpmver %{gover}

%global _dwz_low_mem_die_limit 0
Expand Down
4 changes: 2 additions & 2 deletions packages/ca-certificates/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ path = "../packages.rs"
releases-url = "https://curl.se/docs/caextract.html"

[[package.metadata.build-package.external-files]]
url = "https://curl.haxx.se/ca/cacert-2023-01-10.pem"
sha512 = "08cd35277bf2260cb3232d7a7ca3cce6b2bd58af9221922d2c6e9838a19c2f96d1ca6d77f3cc2a3ab611692f9fec939e9b21f67442282e867a487b0203ee0279"
url = "https://curl.haxx.se/ca/cacert-2023-08-22.pem"
sha512 = "26a6696b4b17a8d95a6baeaf0643e21789eae033a680c18ff7083d3dea70b908e12c6afeb39aee0025c4f65428d2c2944576893936818426c5030d7e150ef1c2"
4 changes: 2 additions & 2 deletions packages/ca-certificates/ca-certificates.spec
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Name: %{_cross_os}ca-certificates
Version: 2023.01.10
Version: 2023.08.22
Release: 1%{?dist}
Summary: CA certificates extracted from Mozilla
License: MPL-2.0
# Note: You can see changes here:
# https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
URL: https://curl.haxx.se/docs/caextract.html
Source0: https://curl.haxx.se/ca/cacert-2023-01-10.pem
Source0: https://curl.haxx.se/ca/cacert-2023-08-22.pem
Source1: ca-certificates-tmpfiles.conf

%description
Expand Down
4 changes: 2 additions & 2 deletions packages/chrony/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ path = "../packages.rs"
releases-url = "https://download.tuxfamily.org/chrony"

[[package.metadata.build-package.external-files]]
url = "https://download.tuxfamily.org/chrony/chrony-4.3.tar.gz"
sha512 = "1394bac3ed684352fe89b7fef7da50e61f9f522abee807627ae1fc4c2dde891017bc8e5b13759fced028f3a1e875d5e4e5a4f85de65c63b5f83d0ca03bb4c5df"
url = "https://download.tuxfamily.org/chrony/chrony-4.4.tar.gz"
sha512 = "45e060eb0c5892552f28dc436429e5823409cc93533127af27b64d08ff9c769fdc72694272232114f5ca1884c2bc8b5e842fae7956dc457358e937bcd3dda4d7"

[build-dependencies]
glibc = { path = "../glibc" }
Expand Down
2 changes: 1 addition & 1 deletion packages/chrony/chrony.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: %{_cross_os}chrony
Version: 4.3
Version: 4.4
Release: 1%{?dist}
Summary: A versatile implementation of the Network Time Protocol
License: GPL-2.0-only
Expand Down
4 changes: 2 additions & 2 deletions packages/cni-plugins/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ path = "../packages.rs"
releases-url = "https://github.com/containernetworking/plugins/releases"

[[package.metadata.build-package.external-files]]
url = "https://github.com/containernetworking/plugins/archive/v1.2.0/plugins-1.2.0.tar.gz"
sha512 = "fb6fb4f46ac1610b3721f5f3a6ddfb096cbf2e5d5b792306edca5351a3944d2f802170d83e5adec01420395bf64fc8a174ede61ac9b93b5ac6b938a4b48651e6"
url = "https://github.com/containernetworking/plugins/archive/v1.3.0/plugins-1.3.0.tar.gz"
sha512 = "87e186b3cd64f66280f5b2293dcdd1fc22cb8f51a248124fb622adc48a893348419ba4c29c4769dede4d9e60f2e9fea5d4198f10badb4ecd20a1551e0b344e10"

# RPM BuildRequires
[build-dependencies]
Expand Down
3 changes: 2 additions & 1 deletion packages/cni-plugins/cni-plugins.spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%global gorepo plugins
%global goimport %{goproject}/%{gorepo}

%global gover 1.2.0
%global gover 1.3.0
%global rpmver %{gover}

%global _dwz_low_mem_die_limit 0
Expand Down Expand Up @@ -55,6 +55,7 @@ install -p -m 0755 bin/* %{buildroot}%{_cross_libexecdir}/cni/bin
%{_cross_libexecdir}/cni/bin/ptp
%{_cross_libexecdir}/cni/bin/sbr
%{_cross_libexecdir}/cni/bin/static
%{_cross_libexecdir}/cni/bin/tap
%{_cross_libexecdir}/cni/bin/tuning
%{_cross_libexecdir}/cni/bin/vlan
%{_cross_libexecdir}/cni/bin/vrf
Expand Down
4 changes: 2 additions & 2 deletions packages/containerd/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ path = "../packages.rs"
releases-url = "https://github.com/containerd/containerd/releases"

[[package.metadata.build-package.external-files]]
url = "https://github.com/containerd/containerd/archive/v1.6.20/containerd-1.6.20.tar.gz"
sha512 = "dd9708c99d95773a78b0fcd77b388cb8a971d0d65502c8b86cbb3b29c48bac31366ae0603d7710a13c21c33adcd341cdec69dcb3c3a06a2d753c4c59f2549d75"
url = "https://github.com/containerd/containerd/archive/v1.6.23/containerd-1.6.23.tar.gz"
sha512 = "576ab87c07700054918ac8fa8e6c1f1ba971722ac7cad8f3d8ecccdb8cb162103fa826fa815f58f5f63d061b2a8dce8f2fbbee3def85cd4a4f8dbee124d2596a"

# RPM BuildRequires
[build-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion packages/containerd/containerd.spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%global gorepo containerd
%global goimport %{goproject}/%{gorepo}

%global gover 1.6.20
%global gover 1.6.23
%global rpmver %{gover}
%global gitrev 1e1ea6e986c6c86565bc33d52e34b81b3e2bc71f

Expand Down
Original file line number Diff line number Diff line change
@@ -1,38 +1,27 @@
From 09721aa67086fde4f3cfd05d13b7ba1c4b05d379 Mon Sep 17 00:00:00 2001
From: Samuel Karp <skarp@amazon.com>
Date: Wed, 8 Jul 2020 11:18:35 -0700
From 3df68e0247900b32e096eefd7465fb5e836916d1 Mon Sep 17 00:00:00 2001
From: Shikha Vyaghra <vyaghras@amazon.com>
Date: Wed, 23 Aug 2023 21:09:50 +0000
Subject: [PATCH] bottlerocket: default filesystem locations
etungsten marked this conversation as resolved.
Show resolved Hide resolved

This patch was originally written by Samuel Karp <[email protected]>
(09721aa67086fde4f3cfd05d13b7ba1c4b05d379). In this updated patch
version all the settings that can be configured using config file,
have been removed from the patch.

Signed-off-by: Sean P. Kelly <[email protected]>
Signed-off-by: Shikha Vyaghra <[email protected]>
---
agent/config/config.go | 6 +++---
agent/config/config_unix.go | 6 +++---
agent/config/config.go | 2 +-
agent/ecscni/plugin_linux.go | 2 +-
agent/ecscni/plugin_unsupported.go | 2 +-
agent/utils/license.go | 6 +++---
5 files changed, 11 insertions(+), 11 deletions(-)
4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/agent/config/config.go b/agent/config/config.go
index 38f0d0f..acebb26 100644
index 34339bd..0cf7426 100644
--- a/agent/config/config.go
+++ b/agent/config/config.go
@@ -51,7 +51,7 @@ const (
AgentPrometheusExpositionPort = 51680

// defaultConfigFileName is the default (json-formatted) config file
- defaultConfigFileName = "/etc/ecs_container_agent/config.json"
+ defaultConfigFileName = "/etc/ecs/ecs.config.json"

// DefaultClusterName is the name of the default cluster.
DefaultClusterName = "default"
@@ -118,13 +118,13 @@ const (
minimumNumImagesToDeletePerCycle = 1

// defaultCNIPluginsPath is the default path where cni binaries are located
- defaultCNIPluginsPath = "/amazon-ecs-cni-plugins"
+ defaultCNIPluginsPath = "/usr/libexec/amazon-ecs-agent"

// DefaultMinSupportedCNIVersion denotes the minimum version of cni spec required
@@ -122,7 +122,7 @@ const (
DefaultMinSupportedCNIVersion = "0.3.0"

// pauseContainerTarball is the path to the pause container tarball
Expand All @@ -41,37 +30,11 @@ index 38f0d0f..acebb26 100644

// DefaultTaskMetadataSteadyStateRate is set as 40. This is arrived from our benchmarking
// results where task endpoint can handle 4000 rps effectively. Here, 100 containers
diff --git a/agent/config/config_unix.go b/agent/config/config_unix.go
index 6c1254d..3adefaa 100644
--- a/agent/config/config_unix.go
+++ b/agent/config/config_unix.go
@@ -29,10 +29,10 @@ const (
// AgentCredentialsAddress is used to serve the credentials for tasks.
AgentCredentialsAddress = "" // this is left blank right now for net=bridge
// defaultAuditLogFile specifies the default audit log filename
- defaultCredentialsAuditLogFile = "/log/audit.log"
+ defaultCredentialsAuditLogFile = "/var/log/ecs/audit.log"

// defaultRuntimeStatsLogFile stores the path where the golang runtime stats are periodically logged
- defaultRuntimeStatsLogFile = `/log/agent-runtime-stats.log`
+ defaultRuntimeStatsLogFile = `/var/log/ecs/agent-runtime-stats.log`
bcressey marked this conversation as resolved.
Show resolved Hide resolved

// DefaultTaskCgroupV1Prefix is default cgroup v1 prefix for ECS tasks
DefaultTaskCgroupV1Prefix = "/ecs"
@@ -63,7 +63,7 @@ func DefaultConfig() Config {
DockerEndpoint: "unix:///var/run/docker.sock",
ReservedPorts: []uint16{SSHPort, DockerReservedPort, DockerReservedSSLPort, AgentIntrospectionPort, AgentCredentialsPort},
ReservedPortsUDP: []uint16{},
- DataDir: "/data/",
+ DataDir: "/var/lib/ecs/data",
DataDirOnHost: "/var/lib/ecs",
DisableMetrics: BooleanDefaultFalse{Value: ExplicitlyDisabled},
ReservedMemory: 0,
vyaghras marked this conversation as resolved.
Show resolved Hide resolved
diff --git a/agent/ecscni/plugin_linux.go b/agent/ecscni/plugin_linux.go
index cb13d41..4acf042 100644
index 0d3a940..3e76060 100644
--- a/agent/ecscni/plugin_linux.go
+++ b/agent/ecscni/plugin_linux.go
@@ -33,7 +33,7 @@ import (
@@ -34,7 +34,7 @@ import (
const (
vpcCNIPluginInterfaceType = "vlan"
// vpcCNIPluginPath is the path of the cni plugin's log file.
Expand All @@ -81,7 +44,7 @@ index cb13d41..4acf042 100644

// newCNIGuard returns a new instance of CNI guard for the CNI client.
diff --git a/agent/ecscni/plugin_unsupported.go b/agent/ecscni/plugin_unsupported.go
index e156b75..55d1a3c 100644
index 05bc3cf..a34a823 100644
--- a/agent/ecscni/plugin_unsupported.go
+++ b/agent/ecscni/plugin_unsupported.go
@@ -26,7 +26,7 @@ import (
Expand All @@ -106,7 +69,7 @@ index 6eccff6..324307c 100644
- thirdPartyFile = "THIRD-PARTY"
+ licenseFile = "/usr/share/licenses/ecs-agent/LICENSE"
+ noticeFile = "/usr/share/licenses/ecs-agent/NOTICE"
+ thirdPartyFile = "/usr/share/licenses/ecs-agent/THIRD-PARTY"
+ thirdPartyFile = "/usr/share/licenses/ecs-agent/THIRD_PARTY.md"
)

var readFile = ioutil.ReadFile
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From b84708cfb634e84ca0ef2ac95292ddc1b370b41f Mon Sep 17 00:00:00 2001
From: Sean McGinnis <stmcg@amazon.com>
Date: Tue, 21 Feb 2023 19:06:43 +0000
From b681439606e39ff21d14742ba58f1ecaf8e7f73d Mon Sep 17 00:00:00 2001
From: Shikha Vyaghra <vyaghras@amazon.com>
Date: Wed, 23 Aug 2023 22:16:58 +0000
Subject: [PATCH] bottlerocket: remove unsupported capabilities

Signed-off-by: Sean McGinnis <[email protected]>
Expand All @@ -10,10 +10,10 @@ Signed-off-by: Arnaldo Garcia Rincon <[email protected]>
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/agent/app/agent_capability.go b/agent/app/agent_capability.go
index 0f78c00..746d87a 100644
index e02e612..7ff5993 100644
--- a/agent/app/agent_capability.go
+++ b/agent/app/agent_capability.go
@@ -248,7 +248,7 @@ func (agent *ecsAgent) capabilities() ([]*ecs.Attribute, error) {
@@ -250,7 +250,7 @@ func (agent *ecsAgent) capabilities() ([]*ecs.Attribute, error) {
capabilities = agent.appendAppMeshCapabilities(capabilities)

// support elastic inference in agent
Expand All @@ -22,15 +22,15 @@ index 0f78c00..746d87a 100644

// support aws router capabilities for fluentd
capabilities = agent.appendFirelensFluentdCapabilities(capabilities)
@@ -272,9 +272,9 @@ func (agent *ecsAgent) capabilities() ([]*ecs.Attribute, error) {
capabilities = agent.appendGMSACapabilities(capabilities)
@@ -277,9 +277,9 @@ func (agent *ecsAgent) capabilities() ([]*ecs.Attribute, error) {
capabilities = agent.appendGMSADomainlessCapabilities(capabilities)

// support efs auth on ecs capabilities
- for _, cap := range agent.cfg.VolumePluginCapabilities {
- capabilities = agent.appendEFSVolumePluginCapabilities(capabilities, cap)
- }
+ // for _, cap := range agent.cfg.VolumePluginCapabilities {
+ // capabilities = agent.appendEFSVolumePluginCapabilities(capabilities, cap)
+ // capabilities = agent.appendEFSVolumePluginCapabilities(capabilities, cap)
+ // }

// support fsxWindowsFileServer on ecs capabilities
Expand Down
12 changes: 6 additions & 6 deletions packages/ecs-agent/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ path = "../packages.rs"
releases-url = "https://github.com/aws/amazon-ecs-agent/releases"

[[package.metadata.build-package.external-files]]
url = "https://github.com/aws/amazon-ecs-agent/archive/v1.70.2/amazon-ecs-agent-1.70.2.tar.gz"
sha512 = "1cfbe51d87f63958b2c86df41dd2d42c7b96924a42be9889f0b7d3a6874c6787e9e65e6d03f974dd6fb75de74868a78f937e47908032b96272770eac39646cbc"
url = "https://github.com/aws/amazon-ecs-agent/archive/v1.75.0/amazon-ecs-agent-1.75.0.tar.gz"
sha512 = "25bbf1f24451bff8f2bac03a83bdee64186f07de466bdebafe1ff149995ca3c57320b13ced85843139369c4638367015600439aa317ee9875038436d0ec67e17"

# The ECS agent repository includes two CNI plugins as git submodules. git
# archive does not include submodules, so the tarball above does not include
Expand All @@ -23,12 +23,12 @@ sha512 = "1cfbe51d87f63958b2c86df41dd2d42c7b96924a42be9889f0b7d3a6874c6787e9e65e
# You can get the commit SHA for the submodules for a particular ecs-agent release here:
# https://github.com/aws/amazon-ecs-agent/blob/ECS_AGENT_VERSION/agent/ecscni/plugin_test.go#L29-L34
[[package.metadata.build-package.external-files]]
url = "https://github.com/aws/amazon-ecs-cni-plugins/archive/db5864722987c34ba309e6e7a7628fd1ccad1520/amazon-ecs-cni-plugins.tar.gz"
sha512 = "550681f5cd9bdf46dd1a3353b9d328217a4d1b8697633fb70c19a0e2ddd839fb08bc764b63b1c23bc77b0d1c125ee8fbb5de0ad55628b1449261e9700e486387"
url = "https://github.com/aws/amazon-ecs-cni-plugins/archive/53a8481891251e66e35847554d52a13fc7c4fd03/amazon-ecs-cni-plugins.tar.gz"
sha512 = "e819c1aae509d19461999bf717d126b3e918b73dc6049e415c4911be6cb11159404bb45bb6c92cdfa16b5b30bb174731e972e3f2be44fa0b51bbc7a969049ab7"

[[package.metadata.build-package.external-files]]
url = "https://github.com/aws/amazon-vpc-cni-plugins/archive/24d6bd87707d1b1801086fc507ebab8d32067412/amazon-vpc-cni-plugins.tar.gz"
sha512 = "70ee8b238ba05528c89042b2cf3102c77bd71ea3a3fef6d7645f420842d82da1c2b3798022b02feec73253c130497b706ea24ae1088f53730baa415cdcfcd606"
url = "https://github.com/aws/amazon-vpc-cni-plugins/archive/a83b66349768e020487a00e31767fc2e6fc88136/amazon-vpc-cni-plugins.tar.gz"
arnaldo2792 marked this conversation as resolved.
Show resolved Hide resolved
sha512 = "ace0d27938b0c47a1208cbc0a30fa70f306270cc66a0b40bdd58d6d7060c69c361c3edcd4cc1d87bdb0f2be839cd6244541c485b3a294c265c5fdf740b012238"

# RPM BuildRequires
[build-dependencies]
Expand Down
10 changes: 5 additions & 5 deletions packages/ecs-agent/ecs-agent.spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@
%global agent_gorepo amazon-ecs-agent
%global agent_goimport %{agent_goproject}/%{agent_gorepo}

%global agent_gover 1.70.2
%global agent_gover 1.75.0

# git rev-parse --short=8
%global agent_gitrev 06008fa1

%global ecscni_goproject github.com/aws
%global ecscni_gorepo amazon-ecs-cni-plugins
%global ecscni_goimport %{ecscni_goproject}/%{ecscni_gorepo}
%global ecscni_gitrev db5864722987c34ba309e6e7a7628fd1ccad1520
%global ecscni_gitrev 53a8481891251e66e35847554d52a13fc7c4fd03

%global vpccni_goproject github.com/aws
%global vpccni_gorepo amazon-vpc-cni-plugins
%global vpccni_goimport %{vpccni_goproject}/%{vpccni_gorepo}
%global vpccni_gitrev 24d6bd87707d1b1801086fc507ebab8d32067412
%global vpccni_gitrev a83b66349768e020487a00e31767fc2e6fc88136
%global vpccni_gover 1.3

# Construct reproducible tar archives
Expand Down Expand Up @@ -296,7 +296,7 @@ mv %{vpccni_gorepo}-%{vpccni_gitrev}/vendor go-vendor/%{vpccni_gorepo}
# ├── LICENSE.amazon-ecs-cni-plugins
# ├── LICENSE.amazon-vpc-cni-plugins
# ├── NOTICE
# ├── THIRD-PARTY
# ├── THIRD_PARTY.md
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would like to double check that the contents have not changed meaningfully. I don't expect they have, but when paths and extensions change, its worth confirming nothing has changed under us.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This has been validated, the contents are same as earlier.

# └── vendor
# ├── amazon-ecs-agent
# │ └── ...
Expand All @@ -309,7 +309,7 @@ mv %{vpccni_gorepo}-%{vpccni_gitrev}/vendor go-vendor/%{vpccni_gorepo}
%{_cross_attribution_vendor_dir}
%license %{agent_gorepo}-%{agent_gover}/LICENSE
%license %{agent_gorepo}-%{agent_gover}/NOTICE
%license %{agent_gorepo}-%{agent_gover}/THIRD-PARTY
%license %{agent_gorepo}-%{agent_gover}/ecs-agent/THIRD_PARTY.md
%license %{ecscni_gorepo}-%{ecscni_gitrev}/LICENSE.%{ecscni_gorepo}
%license %{vpccni_gorepo}-%{vpccni_gitrev}/LICENSE.%{vpccni_gorepo}

Expand Down
1 change: 1 addition & 0 deletions packages/ecs-agent/ecs.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
ECS_LOGFILE=/var/log/ecs/ecs-agent.log
ECS_LOGLEVEL="{{settings.ecs.loglevel}}"
ECS_AGENT_CONFIG_FILE_PATH="/etc/ecs/ecs.config.json"
{{#if settings.container-registry.credentials~}}
ECS_ENGINE_AUTH_TYPE=dockercfg
ECS_ENGINE_AUTH_DATA='{
Expand Down
4 changes: 2 additions & 2 deletions packages/ethtool/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ path = "../packages.rs"
releases-url = "https://kernel.org/pub/software/network/ethtool/"

[[package.metadata.build-package.external-files]]
url = "https://mirrors.edge.kernel.org/pub/software/network/ethtool/ethtool-6.2.tar.xz"
sha512 = "ff1f14c7876163bef93ca48e22a3429f09b4bcb3e1d101ef297d9f226e3fc2d3c3f19faf5b85f54cb558479e4a408ef5356a2d12e7ba132cc4cadaf92effccaf"
url = "https://mirrors.edge.kernel.org/pub/software/network/ethtool/ethtool-6.4.tar.xz"
sha512 = "5e389564b41e9494df102f9fb703ae2d80ba38346d84ec6c89b024ec21c85eca9f58e88012290feaa88d3ce035d6f779913798b0ca177e8d0a08eff197eb6afd"

[build-dependencies]
glibc = { path = "../glibc" }
Expand Down
2 changes: 1 addition & 1 deletion packages/ethtool/ethtool.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: %{_cross_os}ethtool
Version: 6.2
Version: 6.4
Release: 1%{?dist}
Summary: Settings tool for Ethernet NICs
License: GPL-2.0-only AND GPL-2.0-or-later
Expand Down
4 changes: 2 additions & 2 deletions packages/iproute/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ path = "../packages.rs"
releases-url = "http://kernel.org/pub/linux/utils/net/iproute2"

[[package.metadata.build-package.external-files]]
url = "https://kernel.org/pub/linux/utils/net/iproute2/iproute2-6.2.0.tar.xz"
sha512 = "b24e0fdd0f51b8b78bc3bb681e3829af47d3011e93f3892289eb070b336709a6883728ecc7627ca37f6449720f8ed1349af321c0d04454894a7175b82f7de151"
url = "https://kernel.org/pub/linux/utils/net/iproute2/iproute2-6.4.0.tar.xz"
sha512 = "42330be6e061302694ea301765ff8d3cbfaeca4b1d06e39778861e4390ed211c03cb2d41498190202b659f7f5647b1ca4857410ef8c16fd601a35e7162788d21"

[build-dependencies]
glibc = { path = "../glibc" }
Expand Down
2 changes: 1 addition & 1 deletion packages/iproute/iproute.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: %{_cross_os}iproute
Version: 6.2.0
Version: 6.4.0
Release: 1%{?dist}
Summary: Tools for advanced IP routing and network device configuration
License: GPL-2.0-or-later AND GPL-2.0-only
Expand Down
Loading