Skip to content

Commit

Permalink
naming change
Browse files Browse the repository at this point in the history
Signed-off-by: Skye Gill <[email protected]>
  • Loading branch information
skyerus committed Mar 14, 2023
1 parent 5622a49 commit 79c3aee
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion apis/core/v1alpha1/clientsideconfiguration_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ type ClientSideConfigurationSpec struct {
GatewayName string `json:"gatewayName"`
HTTPRouteHostname string `json:"httpRouteHostname"`
HTTPRouteName string `json:"httpRouteName"`
HTTPRoutePort int32 `json:"httpRoutePort"`
GatewayListenerPort int32 `json:"gatewayListenerPort"`
FlagSourceConfiguration string `json:"flagSourceConfiguration"`
GatewayClassName string `json:"gatewayClassName"`
CorsAllowOrigin string `json:"corsAllowOrigin"`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,25 +43,25 @@ spec:
type: string
gatewayClassName:
type: string
gatewayListenerPort:
format: int32
type: integer
gatewayName:
type: string
httpRouteHostname:
type: string
httpRouteName:
type: string
httpRoutePort:
format: int32
type: integer
serviceAccountName:
type: string
required:
- corsAllowOrigin
- flagSourceConfiguration
- gatewayClassName
- gatewayListenerPort
- gatewayName
- httpRouteHostname
- httpRouteName
- httpRoutePort
- serviceAccountName
type: object
status:
Expand Down
2 changes: 1 addition & 1 deletion config/samples/dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,6 @@ spec:
httpRouteName: clientsidegatewayhttproute
httpRouteHostname: flagd.ofoclientapp.com
serviceAccountName: default
httpRoutePort: 80
gatewayListenerPort: 80
corsAllowOrigin: "http://ofoclientapp.com:8080"
---
4 changes: 2 additions & 2 deletions controllers/clientsideconfiguration_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ func (r *ClientSideConfigurationReconciler) Reconcile(ctx context.Context, req c
Name: clientSideGatewayListenerName,
Hostname: &hostname,
Protocol: gatewayv1beta1.HTTPProtocolType,
Port: gatewayv1beta1.PortNumber(csconf.Spec.HTTPRoutePort),
Port: gatewayv1beta1.PortNumber(csconf.Spec.GatewayListenerPort),
AllowedRoutes: &gatewayv1beta1.AllowedRoutes{
Namespaces: &gatewayv1beta1.RouteNamespaces{
From: &namespacesFromSame,
Expand All @@ -209,7 +209,7 @@ func (r *ClientSideConfigurationReconciler) Reconcile(ctx context.Context, req c
Name: clientSideGatewayListenerName,
Hostname: &hostname,
Protocol: gatewayv1beta1.HTTPProtocolType,
Port: gatewayv1beta1.PortNumber(csconf.Spec.HTTPRoutePort),
Port: gatewayv1beta1.PortNumber(csconf.Spec.GatewayListenerPort),
AllowedRoutes: &gatewayv1beta1.AllowedRoutes{
Namespaces: &gatewayv1beta1.RouteNamespaces{
From: &namespacesFromSame,
Expand Down

0 comments on commit 79c3aee

Please sign in to comment.