Skip to content

Commit

Permalink
move to using solo's version of the istio operator fork
Browse files Browse the repository at this point in the history
  • Loading branch information
jehawley committed Nov 8, 2024
1 parent b7169e7 commit 3c5925e
Show file tree
Hide file tree
Showing 14 changed files with 116 additions and 154 deletions.
4 changes: 2 additions & 2 deletions codegen/istio_groups.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package codegen

import (
operator "github.com/jehawley/istio/operator/pkg/apis/istio/v1alpha1"
operator "github.com/solo-io/istio-operator-legacy/operator/pkg/apis/istio/v1alpha1"
"github.com/solo-io/skv2/codegen/model"
extensionsv1alpha1 "istio.io/client-go/pkg/apis/extensions/v1alpha1"
networkingv1 "istio.io/client-go/pkg/apis/networking/v1"
Expand Down Expand Up @@ -143,7 +143,7 @@ func istioGroups() []model.Group {
Kind: "IstioOperator",
},
},
CustomTypesImportPath: "github.com/jehawley/istio/operator/pkg/apis/istio/v1alpha1",
CustomTypesImportPath: "github.com/solo-io/istio-operator-legacy/operator/pkg/apis/istio/v1alpha1",
ApiRoot: istioApiRoot,
},
{
Expand Down
5 changes: 3 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ require (
github.com/aws/aws-app-mesh-controller-for-k8s v1.1.1
github.com/cilium/cilium v1.15.0-pre.2
github.com/golang/mock v1.6.0
github.com/jehawley/istio v0.0.0-20241108154541-bc174863852a
github.com/pkg/errors v0.9.1
github.com/rotisserie/eris v0.1.1
github.com/servicemeshinterface/smi-sdk-go v0.4.1
github.com/solo-io/istio-operator-legacy v0.0.0-20241108164300-f85fe304b807
github.com/solo-io/skv2 v0.41.0
istio.io/client-go v1.24.0
k8s.io/api v0.31.1
Expand All @@ -21,6 +21,7 @@ require (
)

require (
dario.cat/mergo v1.0.1 // indirect
github.com/BurntSushi/toml v1.3.2 // indirect
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver v1.4.2 // indirect
Expand Down Expand Up @@ -73,14 +74,14 @@ require (
github.com/huandu/xstrings v1.5.0 // indirect
github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0 // indirect
github.com/iancoleman/strcase v0.3.0 // indirect
github.com/imdario/mergo v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/invopop/jsonschema v0.7.0 // indirect
github.com/invopop/yaml v0.2.0 // indirect
github.com/joho/godotenv v1.3.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/k0kubun/pp v2.3.0+incompatible // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
Expand Down
185 changes: 73 additions & 112 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/api/istio/install.istio.io/v1alpha1/clients.go

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

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

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

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

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

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

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

56 changes: 28 additions & 28 deletions pkg/api/istio/install.istio.io/v1alpha1/mocks/clients.go

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

2 changes: 1 addition & 1 deletion pkg/api/istio/install.istio.io/v1alpha1/sets/mocks/sets.go

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

2 changes: 1 addition & 1 deletion pkg/api/istio/install.istio.io/v1alpha1/sets/sets.go

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

2 changes: 1 addition & 1 deletion pkg/api/istio/install.istio.io/v1alpha1/type_helpers.go

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

0 comments on commit 3c5925e

Please sign in to comment.