chore: ApisixUpstream v2 #1141
Merged
chore: ApisixUpstream v2 #1141
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
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
Codecov Report
@@ Coverage Diff @@
## master #1141 +/- ##
==========================================
+ Coverage 30.24% 30.70% +0.46%
==========================================
Files 81 81
Lines 9453 9887 +434
==========================================
+ Hits 2859 3036 +177
- Misses 6279 6527 +248
- Partials 315 324 +9
Continue to review full report at Codecov.
|
conf/config-default.yaml
Outdated
| @@ -77,6 +77,7 @@ kubernetes: | |||
| # Note: This feature is currently under development and may not work as expected. | |||
| # It is not recommended to use it in a production environment. | |||
| # Before we announce support for it to reach Beta level or GA. | |||
| apisix_version: apisix.apache.org/v2beta3 #the api group version default "apisix.apache.org/v2beta3", can be "apisix.apache.org/v2beta3" or "apisix.apache.org/v2" | |||
There was a problem hiding this comment.
I think it would be better to name it api_version or cr_api_version
| @@ -67,6 +67,8 @@ const ( | |||
| ControllerName = "apisix.apache.org/gateway-controller" | |||
| ) | |||
|
|
|||
| type ApisxiVersion string | |||
|
|
|||
16 tasks
tao12345666333
approved these changes
Jul 11, 2022
pkg/config/config.go
Outdated
| @@ -57,8 +57,8 @@ const ( | |||
| ApisixV2beta3 = "apisix.apache.org/v2beta3" | |||
| // ApisixV2 represents apisix.apache.org/v2 | |||
| ApisixV2 = "apisix.apache.org/v2" | |||
| // DefaultApisixVersion refers to the default resource version | |||
| DefaultApisixVersion = ApisixV2beta3 | |||
| // DefaultApiVersion refers to the default resource version | |||
There was a problem hiding this comment.
Suggested change
| // DefaultApiVersion refers to the default resource version | |
| // DefaultAPIVersion refers to the default resource version |
pkg/config/config.go
Outdated
| @@ -99,6 +104,7 @@ type KubernetesConfig struct { | |||
| ApisixConsumerVersion string `json:"apisix_consumer_version" yaml:"apisix_consumer_version"` | |||
| ApisixTlsVersion string `json:"apisix_tls_version" yaml:"apisix_tls_version"` | |||
| ApisixClusterConfigVersion string `json:"apisix_cluster_config_version" yaml:"apisix_cluster_config_version"` | |||
| ApiVersion string `json:"api_version" yaml:"api_version"` | |||
There was a problem hiding this comment.
I suggest change it to APIVersion
gxthrj
approved these changes
Jul 11, 2022
tao12345666333
approved these changes
Jul 11, 2022
AlinsRan
added a commit
to AlinsRan/apisix-ingress-controller
that referenced
this pull request
Jul 12, 2022
AlinsRan
added a commit
to AlinsRan/apisix-ingress-controller
that referenced
this pull request
Jul 12, 2022
16 tasks
8 tasks
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.
Type of change:
What this PR does / why we need it:
Pre-submission checklist: