Skip to content

Commit

Permalink
chore: remove PluginOrderingVersionCutoff & TLSPassthroughCutoff chec…
Browse files Browse the repository at this point in the history
…ks (#4795)
  • Loading branch information
programmer04 authored Oct 10, 2023
1 parent 7e37282 commit 07dad9b
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 8 deletions.
3 changes: 0 additions & 3 deletions internal/versions/versions.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ var (
// ExplicitRegexPathVersionCutoff is the lowest Kong version requiring the explicit "~" prefixes in regular expression paths.
ExplicitRegexPathVersionCutoff = semver.Version{Major: 3, Minor: 0}

// PluginOrderingVersionCutoff is the Kong version prior to the addition of plugin ordering.
PluginOrderingVersionCutoff = semver.Version{Major: 3}

// ConsumerGroupsVersionCutoff is the Kong version prior to the addition of Consumer Groups as first class citizens.
ConsumerGroupsVersionCutoff = semver.Version{Major: 3, Minor: 4}

Expand Down
2 changes: 0 additions & 2 deletions test/integration/plugin_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/kong/kubernetes-ingress-controller/v2/internal/annotations"
"github.com/kong/kubernetes-ingress-controller/v2/internal/versions"
kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1"
"github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset"
"github.com/kong/kubernetes-ingress-controller/v2/test"
Expand Down Expand Up @@ -160,7 +159,6 @@ func TestPluginEssentials(t *testing.T) {
func TestPluginOrdering(t *testing.T) {
t.Parallel()

RunWhenKongVersion(t, fmt.Sprintf(">=%s", versions.PluginOrderingVersionCutoff))
RunWhenKongEnterprise(t)

ctx := context.Background()
Expand Down
3 changes: 0 additions & 3 deletions test/integration/tcpingress_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/kong/kubernetes-ingress-controller/v2/internal/annotations"
"github.com/kong/kubernetes-ingress-controller/v2/internal/versions"
kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1"
"github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset"
"github.com/kong/kubernetes-ingress-controller/v2/test"
Expand Down Expand Up @@ -310,8 +309,6 @@ func TestTCPIngressTLSPassthrough(t *testing.T) {
// after determining why the gateway is discarding these requests and applying any necessary fixes.
// RunWhenKongExpressionRouter(t)

RunWhenKongVersion(t, fmt.Sprintf(">=%s", versions.TLSPassthroughCutoff))

t.Log("locking Gateway TLS ports")
tlsMutex.Lock()
t.Cleanup(func() {
Expand Down

0 comments on commit 07dad9b

Please sign in to comment.