MAISTRA-2717: Add automation for merging upstream changes #181
Conversation
This adds a slightly modified version of the automator.sh script present in Istio. It has support for merging upstream repository changes into downstream. If the merge fails, an issue will be created and maintainers notified. This also adds a new builder image for the "main" branch that works for both Istio and Envoy/Proxy repositories. Finally this adds a periodic job that runs once a day triggering the merge of envoy/envoy@main into maistra/envoy@main.
| GO111MODULE=on go get -ldflags="-s -w" k8s.io/code-generator/cmd/deepcopy-gen@kubernetes-${K8S_CODE_GENERATOR_VERSION} && \ | ||
| GO111MODULE=on go get -ldflags="-s -w" k8s.io/code-generator/cmd/go-to-protobuf@kubernetes-${K8S_CODE_GENERATOR_VERSION} && \ | ||
| \ | ||
| go install github.com/mikefarah/yq/v3@latest && mv /usr/local/bin/yq /usr/local/bin/yq-go && \ |
There was a problem hiding this comment.
At the surface this looks like a personal repo to me, and doesn't seem to pin to a specific version. is that ok?
|
|
||
| # Versions | ||
| ENV ISTIO_TOOLS_SHA=ba5896b1eb6542688ff18c70559dbc7e4c2344ce | ||
| ENV KUBECTL_VERSION="v1.20.4" |
There was a problem hiding this comment.
I wonder, should we further pin these versions by matching to SHA's?
Also, is it worth adding a date to each dependency so we can easily have a sense of the age of when a dep last changed version?
There was a problem hiding this comment.
Most of these numbers & versions should match istio's version. We must use the same versions as istio is using so that we don't diverge.
|
Did we merge upstream changes into envoy? in maistra/istio, we have been doing rebases of our patches instead, to keep us from diverging too much |
|
It's a WiP: maistra/envoy#114 |
|
just asking because we talked about sharing a script between envoy and istio. if we do merges in envoy but rebases in istio, that doesn't work out |
|
We can discuss this again. We could do merge on both. Or update the script to accept a flag that tells whether to do a merge or rebase. |
This adds a slightly modified version of the automator.sh
script present in Istio. It has support for merging upstream
repository changes into downstream. If the merge fails, an issue
will be created and maintainers notified.
This also adds a new builder image for the "main" branch that
works for both Istio and Envoy/Proxy repositories.
Finally this adds a periodic job that runs once a day triggering
the merge of envoy/envoy@main into maistra/envoy@main.