From d270d86a5cc3fd2115af797011c2fc89ebda82ba Mon Sep 17 00:00:00 2001 From: Alex Snaps Date: Tue, 19 Dec 2023 12:35:42 -0500 Subject: [PATCH] Use tag, not branch Use proper tag of project sail: sail-mvp2 --- config/dependencies/istio/sail/istio.yaml | 1 - config/dependencies/istio/sail/kustomization.yaml | 2 +- go.mod | 4 ++-- go.sum | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/config/dependencies/istio/sail/istio.yaml b/config/dependencies/istio/sail/istio.yaml index c8abff12b..26713ed1e 100644 --- a/config/dependencies/istio/sail/istio.yaml +++ b/config/dependencies/istio/sail/istio.yaml @@ -5,7 +5,6 @@ metadata: namespace: istio-system spec: version: v1.20.0 - namespace: istio-system # Disable autoscaling to reduce dev resources values: pilot: diff --git a/config/dependencies/istio/sail/kustomization.yaml b/config/dependencies/istio/sail/kustomization.yaml index 52019af44..ee293cd20 100644 --- a/config/dependencies/istio/sail/kustomization.yaml +++ b/config/dependencies/istio/sail/kustomization.yaml @@ -1,4 +1,4 @@ --- namespace: istio-system resources: -- github.com/maistra/istio-operator/config/default?ref=maistra-3.0 +- github.com/maistra/istio-operator/config/default?ref=sail-mvp2 diff --git a/go.mod b/go.mod index 14c360111..4696f1e77 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ require ( k8s.io/client-go v0.28.4 k8s.io/klog/v2 v2.110.1 k8s.io/utils v0.0.0-20231127182322-b307cd553661 - maistra.io/istio-operator v0.0.0-20231214211859-76e404c8df41 + maistra.io/istio-operator v0.0.0-20231207034822-2025bead5bf0 sigs.k8s.io/controller-runtime v0.16.3 sigs.k8s.io/gateway-api v1.0.1-0.20231204134048-c7da42e6eafc ) @@ -171,6 +171,6 @@ require ( sigs.k8s.io/yaml v1.4.0 // indirect ) -replace maistra.io/istio-operator => github.com/maistra/istio-operator v0.0.0-20231214211859-76e404c8df41 +replace maistra.io/istio-operator => github.com/maistra/istio-operator v0.0.0-20231207034822-2025bead5bf0 replace github.com/imdario/mergo => dario.cat/mergo v0.3.5 diff --git a/go.sum b/go.sum index dd6c61c4a..4fa145aed 100644 --- a/go.sum +++ b/go.sum @@ -272,8 +272,8 @@ github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhn github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= -github.com/maistra/istio-operator v0.0.0-20231214211859-76e404c8df41 h1:ihBNQRjbQxzSzSKVIJivoME371XMbrxYTk/Zq7tYohs= -github.com/maistra/istio-operator v0.0.0-20231214211859-76e404c8df41/go.mod h1:647w84PGqHJZFBvik6DtvFSf7MjGG8U2U/+GGc30D8A= +github.com/maistra/istio-operator v0.0.0-20231207034822-2025bead5bf0 h1:jeNCg6AaBI62L3ybfmRteL/dSDP5JA0fwRphvQ1IKkU= +github.com/maistra/istio-operator v0.0.0-20231207034822-2025bead5bf0/go.mod h1:ckgG8jFswtqXDxNXdbz41Xk0gia/sjy7IamSvQcRLtE= github.com/markbates/errx v1.1.0 h1:QDFeR+UP95dO12JgW+tgi2UVfo0V8YBHiUIOaeBPiEI= github.com/markbates/errx v1.1.0/go.mod h1:PLa46Oex9KNbVDZhKel8v1OT7hD5JZ2eI7AHhA0wswc= github.com/markbates/oncer v1.0.0 h1:E83IaVAHygyndzPimgUYJjbshhDTALZyXxvk9FOlQRY=