[Security Hardened Shoot Cluster] Rule 1003 implementation#454
Merged
AleksandarSavchev merged 5 commits intogardener:mainfrom Mar 25, 2025
Merged
[Security Hardened Shoot Cluster] Rule 1003 implementation#454AleksandarSavchev merged 5 commits intogardener:mainfrom
AleksandarSavchev merged 5 commits intogardener:mainfrom
Conversation
gardener-robot
added
needs/review
size/L
dimityrmirchev
requested changes
Mar 21, 2025
Member
dimityrmirchev
left a comment
dimityrmirchev
left a comment
There was a problem hiding this comment.
Thanks. I have some suggestions
| version: <supported-version> | ||
| ``` | ||
|
|
||
| The supported versions can be found in the used `CloudProfile`. |
Member
There was a problem hiding this comment.
Why is this line removed?
Member
Author
There was a problem hiding this comment.
Must have written on top of it 😅 my bad
| ``` | ||
|
|
||
| The supported versions can be found in the used `CloudProfile`. | ||
| ### 1003 - Shoot clusters should have Lakom extension configured correctly. <a id="1003"></a> |
Member
There was a problem hiding this comment.
Suggested change
| ### 1003 - Shoot clusters should have Lakom extension configured correctly. <a id="1003"></a> | |
| ### 1003 - Shoot clusters should have the Lakom extension configured. <a id="1003"></a> |
Member
There was a problem hiding this comment.
Would it be better to use must instead of should when severity is ranked HIGH?
| ### 1003 - Shoot clusters should have Lakom extension configured correctly. <a id="1003"></a> | ||
|
|
||
| #### Description | ||
| Shoot clusters should have Lakom extension configured correctly. Trusted public keys should be configured for the Lakom extension. |
Member
There was a problem hiding this comment.
Suggested change
| Shoot clusters should have Lakom extension configured correctly. Trusted public keys should be configured for the Lakom extension. | |
| Lakom is an admission controller which implements image signature verification. Shoot clusters should have the Lakom extension configured with trusted public keys so that only trusted images are allowed in the cluster. |
| Shoot clusters should have Lakom extension configured correctly. Trusted public keys should be configured for the Lakom extension. | ||
|
|
||
| #### Fix | ||
| Follow the Lakom extension documentation on how to configure [TrustedKeysResourceName](https://github.com/gardener/gardener-extension-shoot-lakom-service/blob/v0.18.1/docs/usage/shoot-extension.md#trustedkeysresourcename) |
Member
There was a problem hiding this comment.
Suggested change
| Follow the Lakom extension documentation on how to configure [TrustedKeysResourceName](https://github.com/gardener/gardener-extension-shoot-lakom-service/blob/v0.18.1/docs/usage/shoot-extension.md#trustedkeysresourcename) | |
| Follow the Lakom extension documentation on how to configure [TrustedKeysResourceName](https://github.com/gardener/gardener-extension-shoot-lakom-service/blob/v0.18.1/docs/usage/shoot-extension.md#trustedkeysresourcename). |
| } | ||
|
|
||
| func (r *Rule1003) Severity() rule.SeverityLevel { | ||
| return rule.SeverityMedium |
Member
There was a problem hiding this comment.
You set this to MEDIUM, but the documentation says HIGH?
| } | ||
|
|
||
| if lakomConfig.TrustedKeysResourceName == nil || len(*lakomConfig.TrustedKeysResourceName) == 0 { | ||
| return rule.Result(r, rule.FailedCheckResult(fmt.Sprintf("Extension %s does not have TrustedKeysResourceName configured.", lakomExtensionType), rule.NewTarget())), nil |
Member
There was a problem hiding this comment.
Suggested change
| return rule.Result(r, rule.FailedCheckResult(fmt.Sprintf("Extension %s does not have TrustedKeysResourceName configured.", lakomExtensionType), rule.NewTarget())), nil | |
| return rule.Result(r, rule.FailedCheckResult(fmt.Sprintf("Extension %s does not configure trusted keys.", lakomExtensionType), rule.NewTarget())), nil |
|
|
||
| if lakomConfig.TrustedKeysResourceName == nil || len(*lakomConfig.TrustedKeysResourceName) == 0 { | ||
| return rule.Result(r, rule.FailedCheckResult(fmt.Sprintf("Extension %s does not have TrustedKeysResourceName configured.", lakomExtensionType), rule.NewTarget())), nil | ||
| } else { |
Member
There was a problem hiding this comment.
No need for the else. It causes not needed nesting
| return rule.Result(r, rule.PassedCheckResult(fmt.Sprintf("Extension %s is correctly configured for the shoot cluster.", lakomExtensionType), rule.NewTarget())), nil | ||
| } | ||
| case extensionLabelValue == "true" && !extensionDisabled: | ||
| return rule.Result(r, rule.FailedCheckResult(fmt.Sprintf("Extension %s does not have extension config configured for the shoot cluster.", lakomExtensionType), rule.NewTarget())), nil |
Member
There was a problem hiding this comment.
Suggested change
| return rule.Result(r, rule.FailedCheckResult(fmt.Sprintf("Extension %s does not have extension config configured for the shoot cluster.", lakomExtensionType), rule.NewTarget())), nil | |
| return rule.Result(r, rule.FailedCheckResult(fmt.Sprintf("Extension %s is not configured for the shoot cluster.", lakomExtensionType), rule.NewTarget())), nil |
| case extensionLabelValue == "true" && !extensionDisabled: | ||
| return rule.Result(r, rule.FailedCheckResult(fmt.Sprintf("Extension %s does not have extension config configured for the shoot cluster.", lakomExtensionType), rule.NewTarget())), nil | ||
| case extensionLabelValue == "true" && extensionDisabled: | ||
| return rule.Result(r, rule.FailedCheckResult(fmt.Sprintf("Extension %s is disabled in the shoot spec and enabled in labels.", lakomExtensionType), rule.NewTarget())), nil |
Member
There was a problem hiding this comment.
Should this be a warning? What can cause this behaviour?
Member
Author
There was a problem hiding this comment.
It does make sense for this to not be marked as failed as we should never enter this case.
| case extensionLabelValue == "true" && extensionDisabled: | ||
| return rule.Result(r, rule.FailedCheckResult(fmt.Sprintf("Extension %s is disabled in the shoot spec and enabled in labels.", lakomExtensionType), rule.NewTarget())), nil | ||
| default: | ||
| return rule.Result(r, rule.FailedCheckResult(fmt.Sprintf("Extension %s has unexpected label value: %s.", lakomExtensionType, extensionLabelValue), rule.NewTarget())), nil |
Member
There was a problem hiding this comment.
Should this be a warning?
Member
Author
There was a problem hiding this comment.
I have changed this one to warning now and added the changes to rule 1000 as well.
AleksandarSavchev
force-pushed
the
add-rule-1003-shs
branch
from
1edd3eb to
ac3e652
Compare
ghost
added
AleksandarSavchev
force-pushed
the
add-rule-1003-shs
branch
from
ac3e652 to
2e8287a
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
Which issue(s) this PR fixes:
Fixes #431
Special notes for your reviewer:
Release note: