-
Notifications
You must be signed in to change notification settings - Fork 451
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
Enhanced Webhook Reconciliation Errors #3180
Merged
jaronoff97
merged 49 commits into
open-telemetry:main
from
taniyourstruly:enhanced-webhook
Sep 5, 2024
+518
−343
Merged
Changes from 1 commit
Commits
Show all changes
49 commits
Select commit
Hold shift + click to select a range
04942af
initial commit
taniyourstruly ffa2407
added enhanced reconciliation errors
taniyourstruly 8c59958
tests
taniyourstruly f80e75e
update
taniyourstruly 64b7730
tests
taniyourstruly 5f290a9
add test
taniyourstruly 72acf24
changelog
taniyourstruly 348dcdb
initial fixes
taniyourstruly 1f420d8
linting
taniyourstruly 0eae73d
changing to warnings
taniyourstruly 2964394
merge conflicts
taniyourstruly 55f7488
shadow declarations
taniyourstruly e57985b
fixing errors
taniyourstruly b594d97
kubebuilder test
taniyourstruly 2fe4630
kubebuilder testing
taniyourstruly 32bac14
fixing file
taniyourstruly 69c39d6
unit test
taniyourstruly b070c5f
Merge branch 'main' into enhanced-webhook
taniyourstruly 895c802
initial changes
taniyourstruly f620524
clean up
taniyourstruly 59f50c1
merge conflicts
taniyourstruly a93594c
Update apis/v1beta1/collector_webhook_test.go
taniyourstruly a1d71f2
fixed test
taniyourstruly 1f5442b
fixed test
taniyourstruly 5a6387c
merge conflicts
taniyourstruly f95327f
merge conflicts
taniyourstruly 33fbc03
unneeded code
taniyourstruly f8fb046
linting
taniyourstruly 65477b5
linting and unit tests
taniyourstruly 3fdc89f
reuse code
taniyourstruly 2fc8b80
Merge branch 'main' of github.com:open-telemetry/opentelemetry-operat…
taniyourstruly eb5eabf
Merge branch 'main' into enhanced-webhook
taniyourstruly 8e7282c
Update apis/v1beta1/collector_webhook.go
taniyourstruly 5dcfa35
Merge branch 'enhanced-webhook' of https://github.com/taniyourstruly/…
taniyourstruly b6f0911
revert to not use getParams
taniyourstruly 56e4402
use config
taniyourstruly df46a05
linting
taniyourstruly 4289b44
more linting
taniyourstruly 42f9a1f
validate as anon func
taniyourstruly eab4fd1
linting
taniyourstruly a4f19e2
linting
taniyourstruly 68d1686
testing without test
taniyourstruly f7f571b
added back test
taniyourstruly bdd2d11
Merge branch 'main' into enhanced-webhook
jaronoff97 616726e
fix
jaronoff97 9707061
Merge pull request #1 from jaronoff97/enhanced-webhook
taniyourstruly c552bd0
make generate
taniyourstruly b01f894
Merge branch 'main' of github.com:open-telemetry/opentelemetry-operat…
taniyourstruly 52eda8a
merge conflicts
taniyourstruly File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
shadow declarations
commit 55f7488100a9937ebc9262c6caec20036be994c0
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -152,9 +152,6 @@ | |
} | ||
if c.bv != nil { | ||
newWarnings := c.bv(*otelcol) | ||
if err != nil { | ||
return append(warnings, newWarnings...), err | ||
} | ||
warnings = append(warnings, newWarnings...) | ||
} | ||
return warnings, nil | ||
|
@@ -184,7 +181,7 @@ | |
} | ||
|
||
if c.bv != nil { | ||
newWarnings := c.bv(*otelcol) | ||
if err != nil { | ||
return append(warnings, newWarnings...), err | ||
} | ||
|
@@ -452,7 +449,7 @@ | |
return nil | ||
} | ||
|
||
// BuildValidator is mostly used for testing purposes | ||
// BuildValidator is mostly used for testing purposes. | ||
type BuildValidator func(c OpenTelemetryCollector) admission.Warnings | ||
|
||
func NewCollectorWebhook( | ||
taniyourstruly marked this conversation as resolved.
Show resolved
Hide resolved
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can you note that this is mostly for testing |
||
|
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
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
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.
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.
can you add a real description here for the purpose of this type?