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.

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

chore(*) remove API V2 #2119

Merged
merged 1 commit into from
Jun 8, 2021
Merged

chore(*) remove API V2 #2119

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
8 changes: 0 additions & 8 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1402,14 +1402,6 @@ workflows:
requires:
- images
- check
- e2e:
<<: *master_workflow_filters
name: test/e2e V2
requires:
- images
- check
# custom parameters
api: v2
Copy link
Contributor

Choose a reason for hiding this comment

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

Shall we remove the whole API versionning machnienry here, or we keep it in preparation for v4?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Let's keep it! We should be able to add V4 as quickly as possible in the future.

- e2e:
<<: *master_workflow_filters
name: test/e2e-ipv6
Expand Down
4 changes: 2 additions & 2 deletions pkg/config/xds/bootstrap/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ func (b *BootstrapServerConfig) Validate() error {
return errors.Wrap(err, "Params validation failed")
}
switch b.APIVersion {
case envoy_common.APIV2, envoy_common.APIV3:
case envoy_common.APIV3:
default:
return errors.Errorf("APIVersion has invalid value. Available values: %q, %q", envoy_common.APIV2, envoy_common.APIV3)
return errors.Errorf("APIVersion has invalid value. Available values: %q", envoy_common.APIV3)
}
return nil
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/config/xds/bootstrap/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ var _ = Describe("BootstrappServerConfig", func() {
It("should be loadable from environment variables", func() {
// setup
env := map[string]string{
"KUMA_BOOTSTRAP_SERVER_API_VERSION": "v2",
"KUMA_BOOTSTRAP_SERVER_API_VERSION": "v3",
"KUMA_BOOTSTRAP_SERVER_PARAMS_ADMIN_ADDRESS": "192.168.0.1",
"KUMA_BOOTSTRAP_SERVER_PARAMS_ADMIN_PORT": "4321",
"KUMA_BOOTSTRAP_SERVER_PARAMS_ADMIN_ACCESS_LOG_PATH": "/var/log",
Expand All @@ -76,7 +76,7 @@ var _ = Describe("BootstrappServerConfig", func() {
Expect(err).ToNot(HaveOccurred())

// and
Expect(cfg.APIVersion).To(Equal(envoy.APIV2))
Expect(cfg.APIVersion).To(Equal(envoy.APIV3))
Expect(cfg.Params.AdminAddress).To(Equal("192.168.0.1"))
Expect(cfg.Params.AdminPort).To(Equal(uint32(4321)))
Expect(cfg.Params.AdminAccessLogPath).To(Equal("/var/log"))
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/xds/bootstrap/testdata/valid-config.input.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: v2
apiVersion: v3
params:
adminAddress: 192.168.0.1
adminPort: 4321
Expand Down
4 changes: 0 additions & 4 deletions pkg/sds/server/components.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (

core_runtime "github.com/kumahq/kuma/pkg/core/runtime"
sds_metrics "github.com/kumahq/kuma/pkg/sds/metrics"
v2 "github.com/kumahq/kuma/pkg/sds/server/v2"
v3 "github.com/kumahq/kuma/pkg/sds/server/v3"
)

Expand All @@ -15,9 +14,6 @@ func Setup(rt core_runtime.Runtime) error {
return err
}

if err := v2.RegisterSDS(rt, sdsMetrics); err != nil {
return errors.Wrap(err, "could not register V2 SDS")
}
if err := v3.RegisterSDS(rt, sdsMetrics); err != nil {
return errors.Wrap(err, "could not register V3 SDS")
}
Expand Down
206 changes: 0 additions & 206 deletions pkg/sds/server/v2/reconciler.go
View file
Open in desktop

This file was deleted.

117 changes: 0 additions & 117 deletions pkg/sds/server/v2/server.go
View file
Open in desktop

This file was deleted.

Loading