start with a clean slate for future multicluster work (#4805) · openservicemesh/osm@e3700d6 (original) (raw)

This repository was archived by the owner on Jul 11, 2023. It is now read-only.

File tree

Original file line number Diff line number Diff line change
@@ -25,10 +25,6 @@ export CTR_REGISTRY_PASSWORD=
25 25 # Default: osm-system
26 26 export K8S_NAMESPACE=osm-system
27 27
28 -# optional: name of Kubernetes contexts that OSM will be deployed in multicluster mode
29 -# export ALPHA_CLUSTER=alpha
30 -# export BETA_CLUSTER=beta
31 -
32 28 # optional: Kubernetes namespace where bookbuyer app will be installed.
33 29 # This cannot be the default namespace because it has to be a namespace that can be deleted.
34 30 # Default: bookbuyer

| Original file line number | Diff line number | Diff line change | | | | | | ---------------------------------------------------------------------------------------------------- | ---------------- | ------------------------------------------------- | ------ | ------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- | | | @@ -88,7 +88,6 @@ The following table lists the configurable parameters of the osm chart and their | | | | | | | | 88 | 88 | | osm.featureFlags.enableEgressPolicy | bool | `true` | Enable OSM's Egress policy API. When enabled, fine grained control over Egress (external) traffic is enforced | | | 89 | 89 | | osm.featureFlags.enableEnvoyActiveHealthChecks | bool | `false` | Enable Envoy active health checks | | | 90 | 90 | | 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 | | | 91 | | -| osm.featureFlags.enableMulticlusterMode | bool | `false` | Enable Multicluster mode. When enabled, multicluster mode will be enabled in OSM | | | 92 | 91 | | osm.featureFlags.enableRetryPolicy | bool | `false` | Enable Retry Policy for automatic request retries | | | 93 | 92 | | osm.featureFlags.enableSnapshotCacheMode | bool | `false` | Enables SnapshotCache feature for Envoy xDS server. | | | 94 | 93 | | 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 | | | | | | | | 141 | 140 | | osm.localProxyMode | string | `"Localhost"` | Proxy mode for the Envoy proxy sidecar. Acceptable values are ['Localhost', 'PodIP'] | | | 142 | 141 | | osm.maxDataPlaneConnections | int | `0` | Sets the max data plane connections allowed for an instance of osm-controller, set to 0 to not enforce limits | | | 143 | 142 | | osm.meshName | string | `"osm"` | Identifier for the instance of a service mesh within a cluster | | | 144 | | -| osm.multicluster | object | `{"gatewayLogLevel":"error"}` | OSM multicluster feature configuration | | | 145 | | -| osm.multicluster.gatewayLogLevel | string | `"error"` | Log level for the multicluster gateway | | | 146 | 143 | | osm.networkInterfaceExclusionList | list | `[]` | Specifies a global list of network interface names to exclude for inbound and outbound traffic interception by the sidecar proxy. | | | 147 | 144 | | osm.osmBootstrap.podLabels | object | `{}` | OSM bootstrap's pod labels | | | 148 | 145 | | osm.osmBootstrap.replicaCount | int | `1` | OSM bootstrap's replica count | |

Original file line number Diff line number Diff line change
@@ -43,9 +43,6 @@ rules:
43 43 - apiGroups: ["config.openservicemesh.io"]
44 44 resources: ["meshconfigs", "meshrootcertificates"]
45 45 verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
46 - - apiGroups: ["config.openservicemesh.io"]
47 -resources: ["multiclusterservices"]
48 -verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
49 46 - apiGroups: ["split.smi-spec.io"]
50 47 resources: ["trafficsplits"]
51 48 verbs: ["list", "get", "watch"]
Original file line number Diff line number Diff line change
@@ -51,7 +51,6 @@ data:
51 51 "featureFlags": {
52 52 "enableWASMStats": {{.Values.osm.featureFlags.enableWASMStats | mustToJson}},
53 53 "enableEgressPolicy": {{.Values.osm.featureFlags.enableEgressPolicy | mustToJson}},
54 - "enableMulticlusterMode": {{.Values.osm.featureFlags.enableMulticlusterMode | mustToJson}},
55 54 "enableSnapshotCacheMode": {{.Values.osm.featureFlags.enableSnapshotCacheMode | mustToJson}},
56 55 "enableAsyncProxyServiceMapping": {{.Values.osm.featureFlags.enableAsyncProxyServiceMapping | mustToJson}},
57 56 "enableIngressBackendPolicy": {{.Values.osm.featureFlags.enableIngressBackendPolicy | mustToJson}},
Original file line number Diff line number Diff line change
@@ -929,27 +929,6 @@
929 929 },
930 930 "additionalProperties": false
931 931 },
932 -"multicluster": {
933 -"$id": "#/properties/osm/properties/multicluster",
934 -"type": "object",
935 -"title": "Multicluster",
936 -"description": "Configuration for multicluster features",
937 -"required": [
938 -"gatewayLogLevel"
939 - ],
940 -"properties": {
941 -"gatewayLogLevel": {
942 -"$id": "#/properties/osm/properties/multicluster/properties/gatewayLogLevel",
943 -"type": "string",
944 -"title": "the gatewayLogLevel port",
945 -"description": "Log level for the multicluster gateway",
946 -"pattern": "^(trace|debug
947 -"examples": [
948 -"error"
949 - ]
950 - }
951 - }
952 - },
953 932 "featureFlags": {
954 933 "$id": "#/properties/osm/properties/featureFlags",
955 934 "type": "object",
@@ -964,7 +943,6 @@
964 943 "required": [
965 944 "enableWASMStats",
966 945 "enableEgressPolicy",
967 -"enableMulticlusterMode",
968 946 "enableAsyncProxyServiceMapping",
969 947 "enableIngressBackendPolicy",
970 948 "enableEnvoyActiveHealthChecks",
@@ -990,15 +968,6 @@
990 968 true
991 969 ]
992 970 },
993 -"enableMulticlusterMode": {
994 -"$id": "#/properties/osm/properties/featureFlags/properties/enableMulticluster",
995 -"type": "boolean",
996 -"title": "Enable Multicluster mode",
997 -"description": "Enable multicluster mode in OSM",
998 -"examples": [
999 -true
1000 - ]
1001 - },
1002 971 "enableAsyncProxyServiceMapping": {
1003 972 "$id": "#/properties/osm/properties/featureFlags/properties/enableAsyncProxyServiceMapping",
1004 973 "type": "boolean",
Original file line number Diff line number Diff line change
@@ -321,9 +321,6 @@ osm:
321 321 # -- Enable OSM's Egress policy API.
322 322 # When enabled, fine grained control over Egress (external) traffic is enforced
323 323 enableEgressPolicy: true
324 -# -- Enable Multicluster mode.
325 -# When enabled, multicluster mode will be enabled in OSM
326 -enableMulticlusterMode: false
327 324 # -- Enable async proxy-service mapping
328 325 enableAsyncProxyServiceMapping: false
329 326 # -- Enables OSM's IngressBackend policy API.
@@ -336,11 +333,6 @@ osm:
336 333 # -- Enable Retry Policy for automatic request retries
337 334 enableRetryPolicy: false
338 335
339 -# -- OSM multicluster feature configuration
340 -multicluster:
341 -# -- Log level for the multicluster gateway
342 -gatewayLogLevel: error
343 -
344 336 # -- Node tolerations applied to control plane pods.
345 337 # The specified tolerations allow pods to schedule onto nodes with matching taints.
346 338 controlPlaneTolerations: []
Original file line number Diff line number Diff line change
@@ -165,6 +165,7 @@ func SearchLogsForSuccess(kubeClient kubernetes.Interface, namespace string, pod
165 165 for {
166 166 select {
167 167 case <-timeout:
168 +log.Error().Err(err).Msgf("Timed out trying to read from pod %s/%s", namespace, podName)
168 169 result <- TestsTimedOut
169 170 case readres := <-readRes:
170 171 line := readres.line