Skip to content
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

Use tag for project sail, not branch #389

Closed
wants to merge 1 commit into from
Closed

Use tag for project sail, not branch #389

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
1 change: 0 additions & 1 deletion config/dependencies/istio/sail/istio.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ metadata:
namespace: istio-system
spec:
version: v1.20.0
namespace: istio-system
# Disable autoscaling to reduce dev resources
values:
pilot:
Expand Down
2 changes: 1 addition & 1 deletion config/dependencies/istio/sail/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Copy link
Member

@adam-cattermole adam-cattermole Jan 9, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had a look at using this tag before - unfortunately the code is pinned but the deployment uses the floating 3.0-latest tag which is not compatible with the tagged code. We could potentially patch the deployment with a compatible nightly build. This will hopefully be fixed in the future so we don't have to override the deployment image ourselves - #382 (comment)

4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down Expand Up @@ -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
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 @@ -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=
Expand Down
Loading