-
Notifications
You must be signed in to change notification settings - Fork 2
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
Upgrade dependencies 2025-02-03 (#6874) #6892
Conversation
c3d3d9d
to
8a94057
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## develop #6892 +/- ##
========================================
Coverage 85.54% 85.54%
========================================
Files 147 147
Lines 21226 21226
========================================
Hits 18158 18158
Misses 3068 3068 ☔ View full report in Codecov by Sentry. |
8a94057
to
0658fc9
Compare
@@ -244,10 +244,10 @@ | |||
# For instructions on finding the latest CIS-hardened AMI, see | |||
# OPERATOR.rst#upgrading-linux-ami | |||
# | |||
# CIS Amazon Linux 2 Kernel 4.14 Benchmark - Level 1 - v12 -4c096026-c6b0-440c-bd2f-6d34904e4fc6 | |||
# CIS Amazon Linux 2 Kernel 4.14 Benchmark - Level 1 - v01 -4c096026-c6b0-440c-bd2f-6d34904e4fc6 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks like a downgrade, which we wouldn't want.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wasn't able to obtain compelling evidence from the Amazon or CIS websites regarding any of these AMI versions.
But, when running the command that operators usually run without removing additional hits, one may observe the creation date of the v01
version (2025-01-31T16:55:33) to be more recent than its v12
predecessor (2024-12-23T17:28:12.000Z).
❯ aws ec2 describe-images --owners aws-marketplace --filters="Name=name,Values=*4c096026-c6b0-440c-bd2f-6d34904e4fc6*" | jq -r '.Images[] | .CreationDate+"\t"+.ImageId+"\t"+.Name' | sort
2024-11-20T16:07:20.000Z ami-0a21f5234dcf8057a CIS Amazon Linux 2 Kernel 4.14 Benchmark - Level 1 - v11 -4c096026-c6b0-440c-bd2f-6d34904e4fc6
2024-12-23T17:28:12.000Z ami-0a5d7e321c34492d7 CIS Amazon Linux 2 Kernel 4.14 Benchmark - Level 1 - v12 -4c096026-c6b0-440c-bd2f-6d34904e4fc6
2025-01-31T16:55:33.000Z ami-005aa69a4e42cc74d CIS Amazon Linux 2 Kernel 4.14 Benchmark - Level 1 - v01 -4c096026-c6b0-440c-bd2f-6d34904e4fc6
Perhaps the values 01 or 12 in v01 or v12 respectively, are representative of the month of the release more than an actual release number count.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Include a note in operator manual about the versioning scheme of the IAM image, regarding the number representing the release month.
0658fc9
to
1082c37
Compare
1082c37
to
228180e
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's add the operator note (as discussed in PL) in this PR.
228180e
to
aa750ab
Compare
OPERATOR.rst
Outdated
say, ``_select dev.gitlab`` and run | ||
AMI ID and adopt updates at our own discretion to avoid unexpected failures. | ||
|
||
Note that the AMI versioning scheme (e.g., `v01`, `v11`) indicates the month of |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The backquotes need to be doubled up.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
By our standards, this documentation change needs to be in a separate commit.
OPERATOR.rst
Outdated
release, and not a sequential release number. For example, `v01` representing | ||
January of the current year is newer than `v12` (December) of the previous year. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
release, and not a sequential release number. For example, `v01` representing | |
January of the current year is newer than `v12` (December) of the previous year. | |
release, and is not a monotonically increasing value. For example, `v01` representing | |
January of the current year is newer than `v12` (December) of the previous year. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
release, and not a sequential release number. For example, `v01` representing | |
January of the current year is newer than `v12` (December) of the previous year. | |
release, and not a sequential release number. |
The second sentence isn't generally true, a v01
release may or may not be older than a v12
release. Then again, this should be immediately apparent to a reasonable person, so I don't think the example is necessary.
157451b
to
a7a6b96
Compare
Transitive dependency updates were stale, ran |
Connected issue: #6874
Checklist
Author
develop
upgrades/yyyy-mm-dd
Upgrade dependencies yyyy-mm-dd
Author (upgrading deployments)
make docker_images.json
and committed the resulting changes or this PR does not modifyazul_docker_images
, or any other variables referenced in the definition of that variableu
tag to commit title or this PR does not require upgrading deploymentsupgrade
or does not require upgrading deploymentsdeploy:shared
or does not modifydocker_images.json
, and does not require deploying theshared
component for any other reasondeploy:gitlab
or does not require deploying thegitlab
componentbackup:gitlab
deploy:runner
or does not require deploying therunner
imageAuthor (before every review)
develop
, squashed old fixupsmake requirements_update
or this PR does not modifyrequirements*.txt
,common.mk
,Makefile
andDockerfile
R
tag to commit title or this PR does not modifyrequirements*.txt
reqs
or does not modifyrequirements*.txt
make integration_test
passes in personal deployment or this PR does not modify functionality that could affect the IT outcomeSystem administrator (after approval)
no demo
Operator (before pushing merge the commit)
develop
_select dev.shared && CI_COMMIT_REF_NAME=develop make -C terraform/shared apply_keep_unused
or this PR is not labeleddeploy:shared
_select dev.gitlab && python scripts/create_gitlab_snapshot.py --no-restart
(see operator manual for details) or this PR is not labeledbackup:gitlab
_select dev.gitlab && CI_COMMIT_REF_NAME=develop make -C terraform/gitlab apply
or this PR is not labeleddeploy:gitlab
_select anvildev.shared && CI_COMMIT_REF_NAME=develop make -C terraform/shared apply_keep_unused
or this PR is not labeleddeploy:shared
_select anvildev.gitlab && python scripts/create_gitlab_snapshot.py --no-restart
(see operator manual for details) or this PR is not labeledbackup:gitlab
_select anvildev.gitlab && CI_COMMIT_REF_NAME=develop make -C terraform/gitlab apply
or this PR is not labeleddeploy:gitlab
deploy:gitlab
deploy:gitlab
System administrator
dev.gitlab
are complete or this PR is not labeleddeploy:gitlab
anvildev.gitlab
are complete or this PR is not labeleddeploy:gitlab
Operator (before pushing merge the commit)
_select dev.gitlab && make -C terraform/gitlab/runner
or this PR is not labeleddeploy:runner
_select anvildev.gitlab && make -C terraform/gitlab/runner
or this PR is not labeleddeploy:runner
sandbox
labeldev
anvildev
sandbox
deploymentanvilbox
deploymentsandbox
deploymentanvilbox
deploymentp
tagsOperator (after pushing the merge commit)
dev
anvildev
dev
dev
anvildev
anvildev
_select dev.shared && make -C terraform/shared apply
or this PR is not labeleddeploy:shared
_select anvildev.shared && make -C terraform/shared apply
or this PR is not labeleddeploy:shared
dev
anvildev
Operator
anvildev.shared
was last deployedscripts/export_inspector_findings.py
againstanvildev
, imported results to Google Sheet and posted screenshot of relevant1 findings as a comment on the connected issue.deploy:shared
,deploy:gitlab
,deploy:runner
andbackup:gitlab
labels to the next promotion PRs or this PR carries none of these labelsdeploy:shared
,deploy:gitlab
,deploy:runner
andbackup:gitlab
labels, from the description of this PR to that of the next promotion PRs or this PR carries none of these labels1A relevant finding is a high or critical vulnerability in an image
that is used within the security boundary. Images not used within the boundary
are tracked in
azul.docker_images
under a key starting with_
.System administrator
Shorthand for review comments
L
line is too longW
line wrapping is wrongQ
bad quotesF
other formatting problem