Skip to content
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

Remove volumeMounts when webhook is disabled #679

Merged
merged 9 commits into from
Sep 14, 2021
Merged

Conversation

fgksgf
Copy link
Member

@fgksgf fgksgf commented Sep 13, 2021

Please answer these questions before submitting a pull request

  • Why submit this pull request?

  • Bugfix

  • New feature provided

  • Improve performance

  • Backport patches

  • Related issues


Bugfix

  • Description
    It will occur errors when webhook is disabled but the controller pod tried to mount the volume.

  • How to fix?
    Add a placeholder in deployment template, decide whether to populate the volumeMount or not according to whether the webhook is enabled.

@codecov-commenter
Copy link

codecov-commenter commented Sep 13, 2021

Codecov Report

Merging #679 (35ad3b9) into master (1e1be74) will not change coverage.
The diff coverage is 100.00%.

❗ Current head 35ad3b9 differs from pull request most recent head 60cca93. Consider uploading reports for the commit 60cca93 to get more accurate results
Impacted file tree graph

@@           Coverage Diff           @@
##           master     #679   +/-   ##
=======================================
  Coverage   35.04%   35.04%           
=======================================
  Files          60       60           
  Lines        5967     5967           
=======================================
  Hits         2091     2091           
  Misses       3625     3625           
  Partials      251      251           
Impacted Files Coverage Δ
pkg/apisix/schema.go 63.26% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1e1be74...60cca93. Read the comment docs.

@@ -63,7 +63,7 @@ func (sc schemaClient) getSchema(ctx context.Context, name string) (*v1.Schema,
)
}

url := sc.url + "/" + name
url := sc.url + name
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why change this? Maybe path.Join is more appropriate.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because I checked logs of E2E test and found there is a duplicated /:
image

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, use path.Join is better.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not suitable to use path.Join:
image

@@ -63,7 +63,7 @@ func (sc schemaClient) getSchema(ctx context.Context, name string) (*v1.Schema,
)
}

url := sc.url + "/" + name
url := sc.url + name
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, use path.Join is better.

@tao12345666333 tao12345666333 linked an issue Sep 14, 2021 that may be closed by this pull request
@gxthrj gxthrj merged commit 7216532 into apache:master Sep 14, 2021
@fgksgf fgksgf deleted the fix-e2e branch September 14, 2021 12:35
fgksgf added a commit to fgksgf/apisix-ingress-controller that referenced this pull request Sep 21, 2021
* Remove volumeMounts when webhook is disabled
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ci: timeout settings for e2e framework
4 participants