fix: check data field for user provided tls #8200
Merged
Conversation
This file contains 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
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #8200 +/- ##
==========================================
+ Coverage 60.83% 63.75% +2.91%
==========================================
Files 354 361 +7
Lines 40935 45045 +4110
==========================================
+ Hits 24903 28718 +3815
- Misses 13772 13973 +201
- Partials 2260 2354 +94
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
zjx20
reviewed
Sep 25, 2024
pkg/controller/plan/tls_utils.go
Outdated
| return errors.New("tls secret's data field shouldn't be nil") | ||
| } | ||
| keys := []string{secretRef.CA, secretRef.Cert, secretRef.Key} | ||
| for _, key := range keys { | ||
| if _, ok := secret.StringData[key]; !ok { | ||
| if (secret.StringData != nil && secret.StringData[key] == "") || (secret.Data != nil && secret.Data[key] == nil) { |
There was a problem hiding this comment.
Check len(secret.Data[key]) == 0 instead, the value can be an empty string.
kubectl create secret generic test-empty-value \
--from-literal=key=''
kubectl get secret test-empty-value -o yaml
>
apiVersion: v1
data:
key: ""
kind: Secret
metadata:
creationTimestamp: "2024-09-25T03:34:43Z"
name: test-empty-value
namespace: default
resourceVersion: "2309582"
uid: ff72e8d8-cbb2-4f7b-aac8-f5b6fd97b0b1
type: Opaque
github-actions
bot
added
size/M
zjx20
approved these changes
Sep 25, 2024
leon-inf
reviewed
Sep 26, 2024
pkg/controller/plan/tls_utils.go
Outdated
| @@ -109,12 +109,12 @@ func CheckTLSSecretRef(ctx context.Context, cli client.Reader, namespace string, | |||
| if err := cli.Get(ctx, types.NamespacedName{Namespace: namespace, Name: secretRef.Name}, secret); err != nil { | |||
| return err | |||
| } | |||
| if secret.StringData == nil { | |||
| if secret.StringData == nil && secret.Data == nil { | |||
There was a problem hiding this comment.
It only needs to check the data field.
free6om
approved these changes
Oct 30, 2024
|
/cherry-pick release-0.9 |
|
🤖 says: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
resolve #8199