StaticRoute: add upstream and remove paths from top-level (#980)

Update `cmd/kusk/manifests/dashboard_staticroute.yaml` to new structure of `StaticRoute`. Signed-off-by: Mohamed Bana <[email protected]>
kubeshop · Nov 21, 2022 · f3401c9 · f3401c9
1 parent 841b792
commit f3401c9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 17 deletions.
diff --git a/api/v1alpha1/staticroute_types.go b/api/v1alpha1/staticroute_types.go
@@ -64,7 +64,7 @@ func (spec *StaticRouteSpec) GetOptionsFromSpec() (*options.StaticOptions, error
 		Paths:    paths,
 		Auth:     spec.Auth,
 		Hosts:    spec.Hosts,
-		Upstream: spec.Upstream,
+		Upstream: *spec.Upstream,
 	}
 	if err := opts.Validate(); err != nil {
 		return nil, fmt.Errorf("failed to validate options: %w", err)

diff --git a/cmd/kusk/cmd/manifest_data.go b/cmd/kusk/cmd/manifest_data.go
diff --git a/cmd/kusk/manifests/dashboard_staticroute.yaml b/cmd/kusk/manifests/dashboard_staticroute.yaml
@@ -6,21 +6,14 @@ metadata:
   labels:
     kusk-managed: "true"
 spec:
+  upstream:
+    service:
+      name: kusk-gateway-dashboard
+      namespace: kusk-system
+      port: 80
   fleet:
     name: kusk-gateway-private-envoy-fleet
     namespace: kusk-system
   hosts:
     - localhost
     - "*"
-  paths:
-    /:
-      get:
-        route:
-          upstream:
-            rewrite:
-              pattern: ""
-              substitution: ""
-            service:
-              name: kusk-gateway-dashboard
-              namespace: kusk-system
-              port: 80
diff --git a/internal/controllers/staticroute_utils.go b/internal/controllers/staticroute_utils.go
@@ -63,7 +63,7 @@ func staticRouteAppendRootPath(logger logr.Logger, opts *options.StaticOptions)
 
 		// `upstream` should be defined at the `spec` level.
 		opts.Paths[pathRoute][method] = &options.SubOptions{
-			Upstream: opts.Upstream,
+			Upstream: &opts.Upstream,
 		}
 
 		logger.Info(

diff --git a/pkg/options/static_options.go b/pkg/options/static_options.go
@@ -63,7 +63,7 @@ type StaticOptions struct {
 	// It should just contain the route path, "/".
 	Paths map[string]StaticOperationSubOptions `yaml:"paths,omitempty" json:"paths,omitempty"`
 	// Upstream is a set of options of a target service to receive traffic.
-	Upstream *UpstreamOptions `json:"upstream,omitempty" yaml:"upstream,omitempty"`
+	Upstream UpstreamOptions `json:"upstream" yaml:"upstream"`
 }
 
 func (o *StaticOptions) fillDefaults() {