start with a clean slate for future multicluster work (#4805)

Start with a clean slate for all multicluster work as the 
current code is unused and the multicluster feature
needs to be redesigned from scratch.

Signed-off-by: Sean Teeling <seanteeling@microsoft.com>

.env.example

@@ -25,10 +25,6 @@ export CTR_REGISTRY_PASSWORD=
 # Default: osm-system
 export K8S_NAMESPACE=osm-system
 
-# optional: name of Kubernetes contexts that OSM will be deployed in multicluster mode
-# export ALPHA_CLUSTER=alpha
-# export BETA_CLUSTER=beta
-
 # optional: Kubernetes namespace where bookbuyer app will be installed.
 # This cannot be the default namespace because it has to be a namespace that can be deleted.
 # Default: bookbuyer

charts/osm/README.md

@@ -88,7 +88,6 @@ The following table lists the configurable parameters of the osm chart and their
 | osm.featureFlags.enableEgressPolicy | bool | `true` | Enable OSM's Egress policy API. When enabled, fine grained control over Egress (external) traffic is enforced |
 | osm.featureFlags.enableEnvoyActiveHealthChecks | bool | `false` | Enable Envoy active health checks |
 | osm.featureFlags.enableIngressBackendPolicy | bool | `true` | Enables OSM's IngressBackend policy API. When enabled, OSM will use the IngressBackend API allow ingress traffic to mesh backends |
-| osm.featureFlags.enableMulticlusterMode | bool | `false` | Enable Multicluster mode. When enabled, multicluster mode will be enabled in OSM |
 | osm.featureFlags.enableRetryPolicy | bool | `false` | Enable Retry Policy for automatic request retries |
 | osm.featureFlags.enableSnapshotCacheMode | bool | `false` | Enables SnapshotCache feature for Envoy xDS server. |
 | osm.featureFlags.enableWASMStats | bool | `true` | Enable extra Envoy statistics generated by a custom WASM extension |
@@ -141,8 +140,6 @@ The following table lists the configurable parameters of the osm chart and their
 | osm.localProxyMode | string | `"Localhost"` | Proxy mode for the Envoy proxy sidecar. Acceptable values are ['Localhost', 'PodIP'] |
 | osm.maxDataPlaneConnections | int | `0` | Sets the max data plane connections allowed for an instance of osm-controller, set to 0 to not enforce limits |
 | osm.meshName | string | `"osm"` | Identifier for the instance of a service mesh within a cluster |
-| osm.multicluster | object | `{"gatewayLogLevel":"error"}` | OSM multicluster feature configuration |
-| osm.multicluster.gatewayLogLevel | string | `"error"` | Log level for the multicluster gateway |
 | osm.networkInterfaceExclusionList | list | `[]` | Specifies a global list of network interface names to exclude for inbound and outbound traffic interception by the sidecar proxy. |
 | osm.osmBootstrap.podLabels | object | `{}` | OSM bootstrap's pod labels |
 | osm.osmBootstrap.replicaCount | int | `1` | OSM bootstrap's replica count |

charts/osm/templates/osm-rbac.yaml

@@ -43,9 +43,6 @@ rules:
   - apiGroups: ["config.openservicemesh.io"]
     resources: ["meshconfigs", "meshrootcertificates"]
     verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
-  - apiGroups: ["config.openservicemesh.io"]
-    resources: ["multiclusterservices"]
-    verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
   - apiGroups: ["split.smi-spec.io"]
     resources: ["trafficsplits"]
     verbs: ["list", "get", "watch"]

charts/osm/templates/preset-mesh-config.yaml

@@ -51,7 +51,6 @@ data:
       "featureFlags": {
         "enableWASMStats": {{.Values.osm.featureFlags.enableWASMStats | mustToJson}},
         "enableEgressPolicy": {{.Values.osm.featureFlags.enableEgressPolicy | mustToJson}},
-        "enableMulticlusterMode": {{.Values.osm.featureFlags.enableMulticlusterMode | mustToJson}},
         "enableSnapshotCacheMode": {{.Values.osm.featureFlags.enableSnapshotCacheMode | mustToJson}},
         "enableAsyncProxyServiceMapping": {{.Values.osm.featureFlags.enableAsyncProxyServiceMapping | mustToJson}},
         "enableIngressBackendPolicy": {{.Values.osm.featureFlags.enableIngressBackendPolicy | mustToJson}},

charts/osm/values.schema.json

@@ -929,27 +929,6 @@
                     },
                     "additionalProperties": false
                 },
-                "multicluster": {
-                    "$id": "#/properties/osm/properties/multicluster",
-                    "type": "object",
-                    "title": "Multicluster",
-                    "description": "Configuration for multicluster features",
-                    "required": [
-                        "gatewayLogLevel"
-                    ],
-                    "properties": {
-                        "gatewayLogLevel": {
-                            "$id": "#/properties/osm/properties/multicluster/properties/gatewayLogLevel",
-                            "type": "string",
-                            "title": "the gatewayLogLevel port",
-                            "description": "Log level for the multicluster gateway",
-                            "pattern": "^(trace|debug|info|warning|warn|error|critical|off)$",
-                            "examples": [
-                                "error"
-                            ]
-                        }
-                    }
-                },
                 "featureFlags": {
                     "$id": "#/properties/osm/properties/featureFlags",
                     "type": "object",
@@ -964,7 +943,6 @@
                     "required": [
                         "enableWASMStats",
                         "enableEgressPolicy",
-                        "enableMulticlusterMode",
                         "enableAsyncProxyServiceMapping",
                         "enableIngressBackendPolicy",
                         "enableEnvoyActiveHealthChecks",
@@ -990,15 +968,6 @@
                                 true
                             ]
                         },
-                        "enableMulticlusterMode": {
-                            "$id": "#/properties/osm/properties/featureFlags/properties/enableMulticluster",
-                            "type": "boolean",
-                            "title": "Enable Multicluster mode",
-                            "description": "Enable multicluster mode in OSM",
-                            "examples": [
-                                true
-                            ]
-                        },
                         "enableAsyncProxyServiceMapping": {
                             "$id": "#/properties/osm/properties/featureFlags/properties/enableAsyncProxyServiceMapping",
                             "type": "boolean",

charts/osm/values.yaml

@@ -321,9 +321,6 @@ osm:
     # -- Enable OSM's Egress policy API.
     # When enabled, fine grained control over Egress (external) traffic is enforced
     enableEgressPolicy: true
-    # -- Enable Multicluster mode.
-    # When enabled, multicluster mode will be enabled in OSM
-    enableMulticlusterMode: false
     # -- Enable async proxy-service mapping
     enableAsyncProxyServiceMapping: false
     # -- Enables OSM's IngressBackend policy API.
@@ -336,11 +333,6 @@ osm:
     # -- Enable Retry Policy for automatic request retries
     enableRetryPolicy: false
 
-  # -- OSM multicluster feature configuration
-  multicluster:
-    # -- Log level for the multicluster gateway
-    gatewayLogLevel: error
-
   # -- Node tolerations applied to control plane pods.
   # The specified tolerations allow pods to schedule onto nodes with matching taints.
   controlPlaneTolerations: []

ci/cmd/maestro/kubernetes_tools.go

@@ -165,6 +165,7 @@ func SearchLogsForSuccess(kubeClient kubernetes.Interface, namespace string, pod
 		for {
 			select {
 			case <-timeout:
+				log.Error().Err(err).Msgf("Timed out trying to read from pod %s/%s", namespace, podName)
 				result <- TestsTimedOut
 			case readres := <-readRes:
 				line := readres.line

cmd/cli/uninstall_mesh.go

@@ -254,7 +254,6 @@ func (d *uninstallMeshCmd) uninstallCustomResourceDefinitions() error {
 		"meshRootCertificate.config.openservicemesh.io",
 		"upstreamtrafficsettings.policy.openservicemesh.io",
 		"retries.policy.openservicemesh.io",
-		"multiclusterservices.config.openservicemesh.io",
 		"httproutegroups.specs.smi-spec.io",
 		"tcproutes.specs.smi-spec.io",
 		"trafficsplits.split.smi-spec.io",

cmd/osm-bootstrap/crds/config_meshconfig.yaml

@@ -269,6 +269,7 @@ spec:
                       type: boolean
                     enableMulticlusterMode:
                       type: boolean
+                      description: DEPRECATED, no longer used
                     enableSnapshotCacheMode:
                       type: boolean
                     enableAsyncProxyServiceMapping:
@@ -471,6 +472,7 @@ spec:
                       type: boolean
                     enableMulticlusterMode:
                       type: boolean
+                      description: DEPRECATED, no longer used
                     enableSnapshotCacheMode:
                       type: boolean
                     enableAsyncProxyServiceMapping: