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

group gateway.gloo.solo.io -> gateway.kgateway.dev #10544

Merged
merged 3 commits into from
Jan 29, 2025
Merged

group gateway.gloo.solo.io -> gateway.kgateway.dev #10544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4226330
group gateway.gloo.solo.io -> gateway.kgateway.dev
yuval-k Jan 28, 2025
846159a
add test for route policy and upstream
yuval-k Jan 29, 2025
56a8585
use new crds in controller test
yuval-k Jan 29, 2025
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
4 changes: 2 additions & 2 deletions ...gateway.gloo.solo.io_directresponses.yaml → ...gateway.kgateway.dev_directresponses.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ metadata:
labels:
app: gloo-gateway
app.kubernetes.io/name: gloo-gateway
name: directresponses.gateway.gloo.solo.io
name: directresponses.gateway.kgateway.dev
Copy link
Contributor

Choose a reason for hiding this comment

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

general question - do we still need the gateway or can we just shorten it to directresponses.kgateway.dev?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

good question - I did that as looking at other projects (like istio) it seems common to have x. format where X is a "theme" (security,traffic, etc..). that's said, there's a chance that given our scope our only "theme" will be gateway. so not sure

spec:
group: gateway.gloo.solo.io
group: gateway.kgateway.dev
names:
categories:
- gloo-gateway
Expand Down
4 changes: 2 additions & 2 deletions ...teway.gloo.solo.io_gatewayparameters.yaml → ...teway.kgateway.dev_gatewayparameters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ metadata:
labels:
app: gloo-gateway
app.kubernetes.io/name: gloo-gateway
name: gatewayparameters.gateway.gloo.solo.io
name: gatewayparameters.gateway.kgateway.dev
spec:
group: gateway.gloo.solo.io
group: gateway.kgateway.dev
names:
categories:
- gloo-gateway
Expand Down
4 changes: 2 additions & 2 deletions ...ay.gloo.solo.io_httplistenerpolicies.yaml → ...ay.kgateway.dev_httplistenerpolicies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ metadata:
app: gateway
app.kubernetes.io/name: gateway
gateway.networking.k8s.io/policy: Direct
name: httplistenerpolicies.gateway.gloo.solo.io
name: httplistenerpolicies.gateway.kgateway.dev
spec:
group: gateway.gloo.solo.io
group: gateway.kgateway.dev
names:
categories:
- gateway
Expand Down
4 changes: 2 additions & 2 deletions ...ateway.gloo.solo.io_listenerpolicies.yaml → ...ateway.kgateway.dev_listenerpolicies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ metadata:
app: gateway
app.kubernetes.io/name: gateway
gateway.networking.k8s.io/policy: Direct
name: listenerpolicies.gateway.gloo.solo.io
name: listenerpolicies.gateway.kgateway.dev
spec:
group: gateway.gloo.solo.io
group: gateway.kgateway.dev
names:
categories:
- gateway
Expand Down
4 changes: 2 additions & 2 deletions ...s/gateway.gloo.solo.io_routepolicies.yaml → ...s/gateway.kgateway.dev_routepolicies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ metadata:
app: gateway
app.kubernetes.io/name: gateway
gateway.networking.k8s.io/policy: Direct
name: routepolicies.gateway.gloo.solo.io
name: routepolicies.gateway.kgateway.dev
spec:
group: gateway.gloo.solo.io
group: gateway.kgateway.dev
names:
categories:
- gateway
Expand Down
4 changes: 2 additions & 2 deletions .../crds/gateway.gloo.solo.io_upstreams.yaml → .../crds/gateway.kgateway.dev_upstreams.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ metadata:
labels:
app: gateway
app.kubernetes.io/name: gateway
name: upstreams.gateway.gloo.solo.io
name: upstreams.gateway.kgateway.dev
spec:
group: gateway.gloo.solo.io
group: gateway.kgateway.dev
names:
categories:
- gateway
Expand Down
2 changes: 1 addition & 1 deletion install/helm/kgateway/templates/gatewayparameters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{- if .Values.gatewayClass.parametersRef.enabled }}
apiVersion: gateway.gloo.solo.io/v1alpha1
apiVersion: gateway.kgateway.dev/v1alpha1
kind: GatewayParameters
metadata:
name: {{ .Values.gatewayClass.parametersRef.name }}
Expand Down
4 changes: 2 additions & 2 deletions install/helm/kgateway/templates/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ rules:
- list
- watch
- apiGroups:
- gateway.gloo.solo.io
- gateway.kgateway.dev
resources:
- directresponses
- gatewayparameters
Expand All @@ -82,7 +82,7 @@ rules:
- list
- watch
- apiGroups:
- gateway.gloo.solo.io
- gateway.kgateway.dev
resources:
- directresponses/status
- gatewayparameters/status
Expand Down
4 changes: 2 additions & 2 deletions install/helm/kgateway/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ gatewayClass:
# Optional parameters reference
parametersRef:
enabled: true
group: "gateway.gloo.solo.io"
group: "gateway.kgateway.dev"
kind: "GatewayParameters"
# The name of the GatewayParameters which is attached by parametersRef to the GatewayClass
name: "kgateway"
Expand All @@ -83,7 +83,7 @@ gatewayClass:
# Gateway proxy configuration
gateway:
# The name of the Gateway annotation that specifies the name of a GatewayParameters CR
parametersAnnotationName: "gateway.gloo.solo.io/gateway-parameters-name"
parametersAnnotationName: "gateway.kgateway.dev/gateway-parameters-name"
envoyContainer:
image:
registry: ghcr.io/kgateway-dev
Expand Down
4 changes: 2 additions & 2 deletions projects/gateway2/api/applyconfiguration/api/v1alpha1/directresponse.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions projects/gateway2/api/applyconfiguration/api/v1alpha1/gatewayparameters.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions projects/gateway2/api/applyconfiguration/api/v1alpha1/httplistenerpolicy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions projects/gateway2/api/applyconfiguration/api/v1alpha1/listenerpolicy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions projects/gateway2/api/applyconfiguration/api/v1alpha1/routepolicy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions projects/gateway2/api/applyconfiguration/api/v1alpha1/upstream.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion projects/gateway2/api/applyconfiguration/utils.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions projects/gateway2/api/v1alpha1/direct_response_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

// +kubebuilder:rbac:groups=gateway.gloo.solo.io,resources=directresponses,verbs=get;list;watch
// +kubebuilder:rbac:groups=gateway.gloo.solo.io,resources=directresponses/status,verbs=get;update;patch
// +kubebuilder:rbac:groups=gateway.kgateway.dev,resources=directresponses,verbs=get;list;watch
// +kubebuilder:rbac:groups=gateway.kgateway.dev,resources=directresponses/status,verbs=get;update;patch

// DirectResponse contains configuration for defining direct response routes.
//
Expand Down
2 changes: 1 addition & 1 deletion projects/gateway2/api/v1alpha1/doc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// +k8s:openapi-gen=true
// +kubebuilder:object:generate=true
// +groupName=gateway.gloo.solo.io
// +groupName=gateway.kgateway.dev
package v1alpha1

// Gateway API resources with status management
Expand Down
4 changes: 2 additions & 2 deletions projects/gateway2/api/v1alpha1/gateway_parameters_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

// +kubebuilder:rbac:groups=gateway.gloo.solo.io,resources=gatewayparameters,verbs=get;list;watch
// +kubebuilder:rbac:groups=gateway.gloo.solo.io,resources=gatewayparameters/status,verbs=get;update;patch
// +kubebuilder:rbac:groups=gateway.kgateway.dev,resources=gatewayparameters,verbs=get;list;watch
// +kubebuilder:rbac:groups=gateway.kgateway.dev,resources=gatewayparameters/status,verbs=get;update;patch

// A GatewayParameters contains configuration that is used to dynamically
// provision Gloo Gateway's data plane (Envoy proxy instance), based on a
Expand Down
4 changes: 2 additions & 2 deletions projects/gateway2/api/v1alpha1/http_listener_policy_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

// +kubebuilder:rbac:groups=gateway.gloo.solo.io,resources=httplistenerpolicies,verbs=get;list;watch
// +kubebuilder:rbac:groups=gateway.gloo.solo.io,resources=httplistenerpolicies/status,verbs=get;update;patch
// +kubebuilder:rbac:groups=gateway.kgateway.dev,resources=httplistenerpolicies,verbs=get;list;watch
// +kubebuilder:rbac:groups=gateway.kgateway.dev,resources=httplistenerpolicies/status,verbs=get;update;patch

// +genclient
// +kubebuilder:object:root=true
Expand Down
4 changes: 2 additions & 2 deletions projects/gateway2/api/v1alpha1/listener_policy_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

// +kubebuilder:rbac:groups=gateway.gloo.solo.io,resources=listenerpolicies,verbs=get;list;watch
// +kubebuilder:rbac:groups=gateway.gloo.solo.io,resources=listenerpolicies/status,verbs=get;update;patch
// +kubebuilder:rbac:groups=gateway.kgateway.dev,resources=listenerpolicies,verbs=get;list;watch
// +kubebuilder:rbac:groups=gateway.kgateway.dev,resources=listenerpolicies/status,verbs=get;update;patch

// +genclient
// +kubebuilder:object:root=true
Expand Down
4 changes: 2 additions & 2 deletions projects/gateway2/api/v1alpha1/route_policy_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

// +kubebuilder:rbac:groups=gateway.gloo.solo.io,resources=routepolicies,verbs=get;list;watch
// +kubebuilder:rbac:groups=gateway.gloo.solo.io,resources=routepolicies/status,verbs=get;update;patch
// +kubebuilder:rbac:groups=gateway.kgateway.dev,resources=routepolicies,verbs=get;list;watch
// +kubebuilder:rbac:groups=gateway.kgateway.dev,resources=routepolicies/status,verbs=get;update;patch

// +genclient
// +kubebuilder:object:root=true
Expand Down
4 changes: 2 additions & 2 deletions projects/gateway2/api/v1alpha1/upstream_policy_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
gwv1 "sigs.k8s.io/gateway-api/apis/v1"
)

// +kubebuilder:rbac:groups=gateway.gloo.solo.io,resources=upstreams,verbs=get;list;watch
// +kubebuilder:rbac:groups=gateway.gloo.solo.io,resources=upstreams/status,verbs=get;update;patch
// +kubebuilder:rbac:groups=gateway.kgateway.dev,resources=upstreams,verbs=get;list;watch
// +kubebuilder:rbac:groups=gateway.kgateway.dev,resources=upstreams/status,verbs=get;update;patch

// +genclient
// +kubebuilder:object:root=true
Expand Down
2 changes: 1 addition & 1 deletion projects/gateway2/api/v1alpha1/zz_generated.register.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion projects/gateway2/controller/controller_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ var _ = BeforeSuite(func() {
testEnv = &envtest.Environment{
CRDDirectoryPaths: []string{
filepath.Join("..", "crds"),
filepath.Join("..", "..", "..", "install", "helm", "gloo", "crds"),
filepath.Join("..", "..", "..", "install", "helm", "kgateway", "crds"),
},
ErrorIfCRDPathMissing: true,
// set assets dir so we can run without the makefile
Expand Down
2 changes: 1 addition & 1 deletion projects/gateway2/controller/gw_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
)

const (
GatewayAutoDeployAnnotationKey = "gateway.gloo.solo.io/auto-deploy"
GatewayAutoDeployAnnotationKey = "gateway.kgateway.dev/auto-deploy"
)

type gatewayReconciler struct {
Expand Down
4 changes: 2 additions & 2 deletions projects/gateway2/examples/example-direct-response-route.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ spec:
- type: ExtensionRef
extensionRef:
name: robots-txt
group: gateway.gloo.solo.io
group: gateway.kgateway.dev
kind: DirectResponse
---
apiVersion: gateway.gloo.solo.io/v1alpha1
apiVersion: gateway.kgateway.dev/v1alpha1
kind: DirectResponse
metadata:
name: robots-txt
Expand Down
2 changes: 1 addition & 1 deletion projects/gateway2/pkg/client/clientset/versioned/typed/api/v1alpha1/api_client.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion projects/gateway2/setup/testdata/listeneropts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ spec:
- name: reviews
port: 8080
---
apiVersion: gateway.gloo.solo.io/v1alpha1
apiVersion: gateway.kgateway.dev/v1alpha1
kind: ListenerPolicy
metadata:
name: buffer-limit
Expand Down
Loading