Merge pull request #2605 from snehachhabria/Routesv2Cutover

feat(routesv2) : Cut over OSM to build routes using routes v2

.env.example

@@ -129,11 +129,6 @@ export BOOKWAREHOUSE_NAMESPACE=bookwarehouse
 # Default: debug
 # export ENVOY_LOG_LEVEL=debug
 
-# optional: ROUTES_V2 (true/false) - Enables experimental routes v2 feature
-# Default: false
-# export ROUTES_V2=false
-#--------------------------------------
-
 ### The section below configures certificates management
 ### OSM has 2 ways to manage certificates
 ### Set CERT_MANAGER to "tresor" to use the internal system (relies on k8s secrets)

charts/osm/README.md

@@ -73,7 +73,6 @@ The following table lists the configurable parameters of the osm chart and their
 | OpenServiceMesh.enableFluentbit | bool | `false` | Enable Fluent Bit sidecar deployment |
 | OpenServiceMesh.enablePermissiveTrafficPolicy | bool | `false` | Enable permissive traffic policy mode |
 | OpenServiceMesh.enablePrometheusScraping | bool | `true` | Enable Prometheus metrics scraping on sidecar proxies |
-| OpenServiceMesh.enableRoutesV2Experimental | bool | `false` | Enable experimental routes feature |
 | OpenServiceMesh.enforceSingleMesh | bool | `false` | Enforce only deploying one mesh in the cluster |
 | OpenServiceMesh.envoyLogLevel | string | `"error"` | Envoy log level is used to specify the level of logs collected from envoy |
 | OpenServiceMesh.fluentBit.enableProxySupport | bool | `false` | Enable proxy support toggle for Fluent Bit |

charts/osm/templates/osm-deployment.yaml

@@ -48,9 +48,6 @@ spec:
             "--cert-manager-issuer-name", "{{.Values.OpenServiceMesh.certmanager.issuerName}}",
             "--cert-manager-issuer-kind", "{{.Values.OpenServiceMesh.certmanager.issuerKind}}",
             "--cert-manager-issuer-group", "{{.Values.OpenServiceMesh.certmanager.issuerGroup}}",
-            {{- if .Values.OpenServiceMesh.enableRoutesV2Experimental }}
-            "--enable-routes-v2-experimental",
-            {{- end }}
           ]
           resources:
             limits:

charts/osm/values.yaml

@@ -61,8 +61,6 @@ OpenServiceMesh:
   enableDebugServer: false
   # -- Enable permissive traffic policy mode
   enablePermissiveTrafficPolicy: false
-   # -- Enable experimental routes feature
-  enableRoutesV2Experimental: false
   # -- Enable egress in the mesh
   enableEgress: false
   # -- Deploy Prometheus

cmd/cli/install.go

@@ -74,7 +74,6 @@ const (
 	defaultEnableDebugServer             = false
 	defaultEnableEgress                  = false
 	defaultEnablePermissiveTrafficPolicy = false
-	defaultEnableRoutesV2Experimental    = false
 	defaultDeployPrometheus              = false
 	defaultEnablePrometheusScraping      = true
 	defaultDeployGrafana                 = false
@@ -114,10 +113,6 @@ type installCmd struct {
 	chartRequested                *chart.Chart
 	setOptions                    []string
 
-	// This is an experimental flag, which results in using
-	// 	the experimental routes v2 feature
-	enableRoutesV2Experimental bool
-
 	// Toggle to enable/disable Prometheus installation
 	deployPrometheus bool
 
@@ -180,7 +175,6 @@ func newInstallCmd(config *helm.Configuration, out io.Writer) *cobra.Command {
 	f.BoolVar(&inst.enableDebugServer, "enable-debug-server", defaultEnableDebugServer, "Enable the debug HTTP server")
 	f.BoolVar(&inst.enablePermissiveTrafficPolicy, "enable-permissive-traffic-policy", defaultEnablePermissiveTrafficPolicy, "Enable permissive traffic policy mode")
 	f.BoolVar(&inst.enableEgress, "enable-egress", defaultEnableEgress, "Enable egress in the mesh")
-	f.BoolVar(&inst.enableRoutesV2Experimental, "enable-routes-v2-experimental", defaultEnableRoutesV2Experimental, "Enable experimental routes v2 feature")
 	f.BoolVar(&inst.deployPrometheus, "deploy-prometheus", defaultDeployPrometheus, "Install and deploy Prometheus")
 	f.BoolVar(&inst.enablePrometheusScraping, "enable-prometheus-scraping", defaultEnablePrometheusScraping, "Enable Prometheus metrics scraping on sidecar proxies")
 	f.BoolVar(&inst.deployGrafana, "deploy-grafana", defaultDeployGrafana, "Install and deploy Grafana")
@@ -260,7 +254,6 @@ func (i *installCmd) resolveValues() (map[string]interface{}, error) {
 		fmt.Sprintf("OpenServiceMesh.prometheus.retention.time=%s", i.prometheusRetentionTime),
 		fmt.Sprintf("OpenServiceMesh.enableDebugServer=%t", i.enableDebugServer),
 		fmt.Sprintf("OpenServiceMesh.enablePermissiveTrafficPolicy=%t", i.enablePermissiveTrafficPolicy),
-		fmt.Sprintf("OpenServiceMesh.enableRoutesV2Experimental=%t", i.enableRoutesV2Experimental),
 		fmt.Sprintf("OpenServiceMesh.deployPrometheus=%t", i.deployPrometheus),
 		fmt.Sprintf("OpenServiceMesh.enablePrometheusScraping=%t", i.enablePrometheusScraping),
 		fmt.Sprintf("OpenServiceMesh.deployGrafana=%t", i.deployGrafana),

cmd/cli/install_test.go

@@ -831,7 +831,6 @@ func getDefaultInstallCmd(writer io.Writer) installCmd {
 		enableEgress:                  defaultEnableEgress,
 		enablePermissiveTrafficPolicy: defaultEnablePermissiveTrafficPolicy,
 		clientSet:                     fake.NewSimpleClientset(),
-		enableRoutesV2Experimental:    defaultEnableRoutesV2Experimental,
 		deployPrometheus:              defaultDeployPrometheus,
 		enablePrometheusScraping:      defaultEnablePrometheusScraping,
 		deployGrafana:                 defaultDeployGrafana,
@@ -871,7 +870,6 @@ func getDefaultValues() map[string]interface{} {
 				}},
 			"enableDebugServer":             defaultEnableDebugServer,
 			"enablePermissiveTrafficPolicy": defaultEnablePermissiveTrafficPolicy,
-			"enableRoutesV2Experimental":    defaultEnableRoutesV2Experimental,
 			"enableEgress":                  defaultEnableEgress,
 			"deployPrometheus":              defaultDeployPrometheus,
 			"enablePrometheusScraping":      defaultEnablePrometheusScraping,

cmd/osm-controller/osm-controller.go

@@ -100,9 +100,6 @@ func init() {
 	flags.StringVar(&certManagerOptions.IssuerKind, "cert-manager-issuer-kind", "Issuer", "cert-manager issuer kind")
 	flags.StringVar(&certManagerOptions.IssuerGroup, "cert-manager-issuer-group", "cert-manager.io", "cert-manager issuer group")
 
-	// feature flags
-	flags.BoolVar(&optionalFeatures.RoutesV2, "enable-routes-v2-experimental", false, "Enable experimental routes v2 feature")
-
 	_ = clientgoscheme.AddToScheme(scheme)
 	_ = v1beta1.AddToScheme(scheme)
 }

demo/deploy-bookstore.sh

@@ -23,6 +23,8 @@ spec:
   ports:
   - port: 80
     name: bookstore-port
+  selector:
+    app: bookstore
 EOF
 
 echo -e "Deploy $SVC Service Account"

demo/run-osm-demo.sh

@@ -36,7 +36,6 @@ DEPLOY_PROMETHEUS="${DEPLOY_PROMETHEUS:-false}"
 ENABLE_PROMETHEUS_SCRAPING="${ENABLE_PROMETHEUS_SCRAPING:-true}"
 DEPLOY_WITH_SAME_SA="${DEPLOY_WITH_SAME_SA:-false}"
 ENVOY_LOG_LEVEL="${ENVOY_LOG_LEVEL:-debug}"
-ROUTES_V2="${ROUTES_V2:-false}"
 
 # For any additional installation arguments. Used heavily in CI.
 optionalInstallArgs=$*
@@ -106,7 +105,6 @@ if [ "$CERT_MANAGER" = "vault" ]; then
       --enable-prometheus-scraping="$ENABLE_PROMETHEUS_SCRAPING" \
       --envoy-log-level "$ENVOY_LOG_LEVEL" \
       --timeout=90s \
-      --enable-routes-v2-experimental="$ROUTES_V2" \
       $optionalInstallArgs
 else
   # shellcheck disable=SC2086
@@ -127,7 +125,6 @@ else
       --enable-prometheus-scraping="$ENABLE_PROMETHEUS_SCRAPING" \
       --envoy-log-level "$ENVOY_LOG_LEVEL" \
       --timeout=90s \
-      --enable-routes-v2-experimental="$ROUTES_V2" \
       $optionalInstallArgs
 fi