Skip to content

need to store the passed value to the apply cache for later compariso… #1294

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.

Sign up for GitHub

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

Merged
openshift-merge-robot merged 1 commit into from
Jan 21, 2022
Merged

need to store the passed value to the apply cache for later compariso… #1294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 12 additions & 18 deletions pkg/operator/resource/resourceapply/admissionregistration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@ import (
"k8s.io/klog/v2"
)

// ApplyMutatingWebhookConfiguration applies the resource
func ApplyMutatingWebhookConfiguration(ctx context.Context, client admissionregistrationclientv1.MutatingWebhookConfigurationsGetter, recorder events.Recorder,
requiredOriginal *admissionregistrationv1.MutatingWebhookConfiguration) (*admissionregistrationv1.MutatingWebhookConfiguration, bool, error) {
return ApplyMutatingWebhookConfigurationImproved(ctx, client, recorder, requiredOriginal, noCache)
}

// ApplyMutatingWebhookConfigurationImproved ensures the form of the specified
// mutatingwebhookconfiguration is present in the API. If it does not exist,
// it will be created. If it does exist, the metadata of the required
Expand All @@ -42,7 +36,8 @@ func ApplyMutatingWebhookConfigurationImproved(ctx context.Context, client admis
if err != nil {
return nil, false, err
}
cache.UpdateCachedResourceMetadata(required, actual)
// need to store the original so that the early comparison of hashes is done based on the original, not a mutated copy
cache.UpdateCachedResourceMetadata(requiredOriginal, actual)
return actual, true, nil
} else if err != nil {
return nil, false, err
Expand All @@ -60,7 +55,8 @@ func ApplyMutatingWebhookConfigurationImproved(ctx context.Context, client admis
copyMutatingWebhookCABundle(existing, required)
webhooksEquivalent := equality.Semantic.DeepEqual(existingCopy.Webhooks, required.Webhooks)
if webhooksEquivalent && !*modified {
cache.UpdateCachedResourceMetadata(required, existingCopy)
// need to store the original so that the early comparison of hashes is done based on the original, not a mutated copy
cache.UpdateCachedResourceMetadata(requiredOriginal, existingCopy)
return existingCopy, false, nil
}
// at this point we know that we're going to perform a write. We're just trying to get the object correct
Expand All @@ -74,7 +70,8 @@ func ApplyMutatingWebhookConfigurationImproved(ctx context.Context, client admis
if err != nil {
return nil, false, err
}
cache.UpdateCachedResourceMetadata(required, actual)
// need to store the original so that the early comparison of hashes is done based on the original, not a mutated copy
cache.UpdateCachedResourceMetadata(requiredOriginal, actual)
return actual, true, nil
}

Expand All @@ -93,12 +90,6 @@ func copyMutatingWebhookCABundle(from, to *admissionregistrationv1.MutatingWebho
}
}

// ApplyValidatingWebhookConfiguration applies the resource
func ApplyValidatingWebhookConfiguration(ctx context.Context, client admissionregistrationclientv1.ValidatingWebhookConfigurationsGetter, recorder events.Recorder,
requiredOriginal *admissionregistrationv1.ValidatingWebhookConfiguration) (*admissionregistrationv1.ValidatingWebhookConfiguration, bool, error) {
return ApplyValidatingWebhookConfigurationImproved(ctx, client, recorder, requiredOriginal, noCache)
}

// ApplyValidatingWebhookConfigurationImproved ensures the form of the specified
// validatingwebhookconfiguration is present in the API. If it does not exist,
// it will be created. If it does exist, the metadata of the required
Expand All @@ -120,7 +111,8 @@ func ApplyValidatingWebhookConfigurationImproved(ctx context.Context, client adm
if err != nil {
return nil, false, err
}
cache.UpdateCachedResourceMetadata(required, actual)
// need to store the original so that the early comparison of hashes is done based on the original, not a mutated copy
cache.UpdateCachedResourceMetadata(requiredOriginal, actual)
return actual, true, nil
} else if err != nil {
return nil, false, err
Expand All @@ -138,7 +130,8 @@ func ApplyValidatingWebhookConfigurationImproved(ctx context.Context, client adm
copyValidatingWebhookCABundle(existing, required)
webhooksEquivalent := equality.Semantic.DeepEqual(existingCopy.Webhooks, required.Webhooks)
if webhooksEquivalent && !*modified {
cache.UpdateCachedResourceMetadata(required, existingCopy)
// need to store the original so that the early comparison of hashes is done based on the original, not a mutated copy
cache.UpdateCachedResourceMetadata(requiredOriginal, existingCopy)
return existingCopy, false, nil
}
// at this point we know that we're going to perform a write. We're just trying to get the object correct
Expand All @@ -152,7 +145,8 @@ func ApplyValidatingWebhookConfigurationImproved(ctx context.Context, client adm
if err != nil {
return nil, false, err
}
cache.UpdateCachedResourceMetadata(required, actual)
// need to store the original so that the early comparison of hashes is done based on the original, not a mutated copy
cache.UpdateCachedResourceMetadata(requiredOriginal, actual)
return actual, true, nil
}

Expand Down
8 changes: 4 additions & 4 deletions pkg/operator/resource/resourceapply/admissionregistration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,10 @@ func TestApplyMutatingConfiguration(t *testing.T) {
recorder := events.NewInMemoryRecorder("test")

testApply := func(expectModify bool) {
updatedHook, modified, err := ApplyMutatingWebhookConfiguration(
updatedHook, modified, err := ApplyMutatingWebhookConfigurationImproved(
context.TODO(),
client.AdmissionregistrationV1(),
recorder, test.input())
recorder, test.input(), noCache)
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -357,10 +357,10 @@ func TestApplyValidatingConfiguration(t *testing.T) {
recorder := events.NewInMemoryRecorder("test")

testApply := func(expectModify bool) {
updatedHook, modified, err := ApplyValidatingWebhookConfiguration(
updatedHook, modified, err := ApplyValidatingWebhookConfigurationImproved(
context.TODO(),
client.AdmissionregistrationV1(),
recorder, test.input())
recorder, test.input(), noCache)
if err != nil {
t.Fatal(err)
}
Expand Down