Skip to content

OCPBUGS-10714: gatewayclass: Update for OSSM 2.4 API change #901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Apr 28, 2023
Merged

OCPBUGS-10714: gatewayclass: Update for OSSM 2.4 API change #901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ require (
github.com/google/go-cmp v0.5.9
github.com/jongio/azidext/go/azidext v0.4.0
github.com/kevinburke/go-bindata v3.11.0+incompatible
github.com/maistra/istio-operator v0.0.0-20230213165116-3138f8d64e59
github.com/maistra/istio-operator v0.0.0-20230322122339-793794762e67
github.com/openshift/api v3.9.1-0.20190924102528-32369d4db2ad+incompatible
github.com/openshift/client-go v0.0.0-20230120202327-72f107311084
github.com/openshift/library-go v0.0.0-20230209193239-2e9167362f31
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -837,8 +837,8 @@ github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN
github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA=
github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
github.com/maistra/istio-operator v0.0.0-20230213165116-3138f8d64e59 h1:JI/0TPDapa9gBljIcFwb66+xNtp+uh0iihROQJ7gQHM=
github.com/maistra/istio-operator v0.0.0-20230213165116-3138f8d64e59/go.mod h1:Ls3+Sa4I7ZFjKm6myTbYYLsodrEKLiB3hi831fTbCk8=
github.com/maistra/istio-operator v0.0.0-20230322122339-793794762e67 h1:MKacYZbpog8jM+uN3/TQS/FUO+Emz/qdAhma63x1pCk=
github.com/maistra/istio-operator v0.0.0-20230322122339-793794762e67/go.mod h1:OTwsAjzSt6870+UXseGMkEPwiyif2xr8A6xyTUrGXVg=
github.com/markbates/inflect v1.0.4/go.mod h1:1fR9+pO2KHEO9ZRtto13gDwwZaAKstQzferVeWqbgNs=
github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE=
github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0=
Expand Down
4 changes: 1 addition & 3 deletions pkg/operator/controller/gatewayclass/servicemeshcontrolplane.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ func desiredServiceMeshControlPlane(name types.NamespacedName, ownerRef metav1.O
},
},
},
Mode: maistrav2.ClusterWideMode,
Policy: &maistrav2.PolicyConfig{
Type: maistrav2.PolicyTypeIstiod,
},
Expand Down Expand Up @@ -148,9 +149,6 @@ func desiredServiceMeshControlPlane(name types.NamespacedName, ownerRef metav1.O
Security: &maistrav2.SecurityConfig{
ManageNetworkPolicy: &f,
},
TechPreview: maistrav1.NewHelmValues(map[string]interface{}{
"controlPlaneMode": "ClusterScoped",
}),
Tracing: &maistrav2.TracingConfig{
Type: maistrav2.TracerTypeNone,
},
Expand Down
85 changes: 81 additions & 4 deletions vendor/github.com/maistra/istio-operator/pkg/apis/maistra/v1/servicemeshmemberroll_types.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions vendor/github.com/maistra/istio-operator/pkg/apis/maistra/v1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions vendor/github.com/maistra/istio-operator/pkg/apis/maistra/v2/extension_providers.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 27 additions & 11 deletions ...or/github.com/maistra/istio-operator/pkg/apis/maistra/v2/servicemeshcontrolplane_types.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

48 changes: 48 additions & 0 deletions vendor/github.com/maistra/istio-operator/pkg/apis/maistra/v2/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ github.com/leodido/go-urn
github.com/mailru/easyjson/buffer
github.com/mailru/easyjson/jlexer
github.com/mailru/easyjson/jwriter
# github.com/maistra/istio-operator v0.0.0-20230213165116-3138f8d64e59
# github.com/maistra/istio-operator v0.0.0-20230322122339-793794762e67
## explicit; go 1.15
github.com/maistra/istio-operator/pkg/apis/maistra/status
github.com/maistra/istio-operator/pkg/apis/maistra/v1
Expand Down