Commit 9af78a0
committed
Bump to OSSM 3.0 for Gateway API support
OSSM 3.0 replaces the OpenShift Service Mesh Operator with Sail Operator, and
the ServiceMeshControlPlane CRD is replaced by the Istio CRD. Vendor the
sail-operator API:
go mod edit -replace github.com/imdario/mergo=github.com/imdario/[email protected]
go get github.com/istio-ecosystem/sail-operator/api/v1alpha1
go mod tidy
go mod vendor
Note that vendoring Sail Operator requires the mergo override.
Update the gatwayclass controller to create a subscription for Sail Operator
instead of the Service Mesh Operator, and to create an Istio CR instead of a
ServiceMeshControlPlane CR.
Currently, OSSM 3.0 is Tech Preview, so we must configure the subscription
accordingly.
* go.mod: Vendor the sail-operator API.
* go.sum:
* vendor/*: Regenerate.
* pkg/operator/client/client.go (init): Register the Sail API instead of the
Maistra APIs.
* pkg/operator/controller/gateway-service-dns/controller.go (Reconcile): Use the
service's labels instead of the service's label selectors. OSSM 3.0 seems to
set the label whereas OSSM 2.y set the label selector.
* pkg/operator/controller/gateway-service-dns/controller_test.go
(Test_Reconcile): Update expectations for service labels and selectors.
* pkg/operator/controller/gatewayclass/servicemeshcontrolplane.go: Rename...
* pkg/operator/controller/gatewayclass/istio.go: ...to this.
(ensureServiceMeshControlPlane): Rename...
(ensureIstio): To this.
(desiredServiceMeshControlPlane): Rename...
(desiredIstio): ...to this.
(currentServiceMeshControlPlane): Rename...
(currentIstio): ...to this.
(createServiceMeshControlPlane): Rename...
(createIstio): ...to this.
(smcpCmpOpts): Rename...
(istioCmpOpts): ...to this. Remove unneeded AllowUnexported rule.
(updateServiceMeshControlPlane): Rename...
(updateIstio): ...to this.
(serviceMeshControlPlaneChanged): Rename...
(istioChanged): ...to this.
* pkg/operator/controller/names.go (ServiceMeshControlPlaneName): Rename...
(IstioName): ...to this. Remove the namespace as the Istio CR is
cluster-scoped.
(ServiceMeshSubscriptionName): Rename...
(SailOperatorSubscriptionName): ...to this. Update the name.
* pkg/operator/controller/gatewayclass/controller.go (Reconcile): Use
ensureIstio instead of ensureServiceMeshControlPlane.
* pkg/operator/controller/gatewayclass/subscription.go
(ensureServiceMeshOperatorSubscription): Use SailOperatorSubscriptionName
instead of ServiceMeshSubscriptionName.
(desiredSubscription): Change the subscription from OSSM to Sail Operator.
For now, install the Tech Preview release.
* test/e2e/gateway_api_test.go (expectedSubscriptionName)
(expectedCatalogSourceName): Update consts to reference the Sail subscription.
* test/e2e/gateway_api_test.go (testGatewayAPIIstioInstallation): Delete call to
assertSMCP. OSSM 3.y no longer uses the ServiceMeshControlPlane API, and the
E2E test does not need to be checking this sort of implementation detail.
* test/e2e/util_gatewayapi_test.go (openshiftIstioOperatorDeploymentName):
Update to reference the Sail operator deployment.
(openshiftSMCPName): Delete const.
(updateIngressOperatorRole):
(assertSMCP): Delete unused functions.1 parent 871b2b2 commit 9af78a0
File tree
473 files changed
+25952
-15217
lines changed- pkg/operator
- client
- controller
- gateway-service-dns
- gatewayclass
- test/e2e
- vendor
- cloud.google.com/go/compute
- internal
- metadata
- github.com
- cespare/xxhash/v2
- cncf/xds/go/xds
- data/orca/v3
- service/orca/v3
- emicklei/go-restful/v3
- envoyproxy/protoc-gen-validate/validate
- evanphx/json-patch
- fatih/color
- go-logr/logr
- go-openapi
- jsonpointer
- jsonreference
- swag
- goccy/go-yaml
- ast
- internal/errors
- parser
- printer
- scanner
- token
- golang/protobuf/jsonpb
- gorilla/websocket
- imdario/mergo
- istio-ecosystem/sail-operator
- api/v1alpha1
- matttproud/golang_protobuf_extensions/v2
- pbutil
- prometheus
- client_golang/prometheus/testutil
- promlint
- client_model/go
- common
- expfmt
- internal/bitbucket.org/ww/goautoneg
- model
- procfs
- sirupsen/logrus
- spf13/cobra
- stretchr/testify/assert
- go.uber.org/zap
- buffer
- zapcore
- golang.org/x
- crypto
- chacha20poly1305
- chacha20
- cryptobyte
- asn1
- hkdf
- sha3
- exp
- slices
- net
- html
- http2
- http/httpguts
- proxy
- websocket
- oauth2
- google
- externalaccount
- internal
- externalaccountauthorizeduser
- externalaccount
- impersonate
- stsexchange
- internal
- sys
- unix
- windows
- time/rate
- xerrors
- google.golang.org
- genproto/googleapis/rpc
- code
- errdetails
- status
- grpc
- attributes
- balancer
- pickfirst
- roundrobin
- binarylog/grpc_binarylog_v1
- codes
- credentials
- encoding
- proto
- internal
- backoff
- balancer/gracefulswitch
- binarylog
- buffer
- channelz
- envconfig
- grpcrand
- grpcsync
- grpcutil
- idle
- pretty
- resolver
- dns
- internal
- unix
- status
- transport
- interop
- grpc_testing
- core
- metadata
- orca
- peer
- resolver
- dns
- stats
- tap
- protobuf
- encoding
- protodelim
- protojson
- prototext
- internal
- descfmt
- editiondefaults
- editionssupport
- encoding
- json
- tag
- text
- errors
- filedesc
- filetype
- genid
- impl
- order
- version
- protoadapt
- proto
- reflect
- protodesc
- protoreflect
- protoregistry
- types
- descriptorpb
- gofeaturespb
- known
- anypb
- durationpb
- timestamppb
- k8s.io
- klog/v2
- utils
- net
- trace
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
473 files changed
+25952
-15217
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | | - | |
| 17 | + | |
18 | 18 | | |
19 | | - | |
| 19 | + | |
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
| 23 | + | |
23 | 24 | | |
24 | 25 | | |
25 | 26 | | |
26 | 27 | | |
27 | 28 | | |
28 | 29 | | |
29 | 30 | | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | | - | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
34 | 35 | | |
35 | 36 | | |
36 | | - | |
37 | | - | |
38 | | - | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
39 | 40 | | |
40 | | - | |
| 41 | + | |
41 | 42 | | |
42 | 43 | | |
43 | | - | |
44 | | - | |
45 | | - | |
46 | | - | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
47 | 48 | | |
48 | | - | |
| 49 | + | |
49 | 50 | | |
50 | 51 | | |
51 | 52 | | |
52 | 53 | | |
53 | 54 | | |
54 | | - | |
55 | | - | |
| 55 | + | |
56 | 56 | | |
57 | 57 | | |
58 | 58 | | |
| |||
64 | 64 | | |
65 | 65 | | |
66 | 66 | | |
67 | | - | |
68 | | - | |
69 | | - | |
70 | | - | |
71 | | - | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
72 | 72 | | |
73 | | - | |
| 73 | + | |
74 | 74 | | |
75 | 75 | | |
76 | 76 | | |
77 | | - | |
78 | | - | |
| 77 | + | |
| 78 | + | |
79 | 79 | | |
80 | | - | |
| 80 | + | |
81 | 81 | | |
82 | 82 | | |
83 | 83 | | |
84 | | - | |
| 84 | + | |
85 | 85 | | |
86 | 86 | | |
87 | 87 | | |
| |||
92 | 92 | | |
93 | 93 | | |
94 | 94 | | |
95 | | - | |
| 95 | + | |
96 | 96 | | |
97 | 97 | | |
98 | | - | |
| 98 | + | |
99 | 99 | | |
100 | 100 | | |
101 | 101 | | |
| |||
106 | 106 | | |
107 | 107 | | |
108 | 108 | | |
109 | | - | |
110 | 109 | | |
111 | 110 | | |
112 | 111 | | |
| |||
119 | 118 | | |
120 | 119 | | |
121 | 120 | | |
122 | | - | |
123 | | - | |
| 121 | + | |
| 122 | + | |
124 | 123 | | |
125 | | - | |
| 124 | + | |
126 | 125 | | |
127 | 126 | | |
128 | 127 | | |
129 | 128 | | |
130 | | - | |
131 | | - | |
132 | | - | |
133 | | - | |
134 | | - | |
135 | | - | |
136 | | - | |
137 | | - | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
138 | 137 | | |
139 | 138 | | |
140 | | - | |
141 | | - | |
| 139 | + | |
| 140 | + | |
142 | 141 | | |
143 | 142 | | |
144 | 143 | | |
145 | | - | |
146 | | - | |
| 144 | + | |
| 145 | + | |
147 | 146 | | |
148 | | - | |
| 147 | + | |
149 | 148 | | |
150 | 149 | | |
151 | 150 | | |
| |||
159 | 158 | | |
160 | 159 | | |
161 | 160 | | |
| 161 | + | |
| 162 | + | |
0 commit comments