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.
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
Merge istio/installer and istio/operator into istio/istio #20106
Merge istio/installer and istio/operator into istio/istio #20106
Conversation
* update installer sha. * update vfs. * update testdata.
* Support Operator e2e * Support Operator e2e * Load Images for kind nodes * Load Images for kind nodes * Load Images for kind nodes * Load Images for kind nodes * Review Comments * Review Comments
* Update readme for controller local debugging * Address comment
As per YAML specifications, YAML documents should begin with `---` and conclude with `...`. Kubernetes accepts pretty sloppy yaml and just requires a `---` although other tools, such as `yq` require properly formatted YAML in order to operate correctly.
…io#469) * auto on and make run demo * make run-build * run with container BUILD_WITH_CONTAINER=1 make gen
* WIP: Refine e2e implementation This is a refinement based upon the prior PRs in this area. Depends-On: istio/tools#483 * Use proper image with jq
* Update to latest common-files * Address reviewer comments.
* Turn off DNS certificate provisioning * Run "make gen" and include the changes * make gen after unset hub and tag
* Update README * Updates * Comments * Remove local build instructions * Add instructions for local running * Remove redundant readme
* update sha for installer to include automtls change * make gen with container build * manual update the default.yaml, ci not failing dueo to configmap * change default.yaml * refresh golden * fix licenses
* update go mod file * update hub and tag to use istio.io/pkg DockerBuildInfo * add ldflags tests for hub and tag * set if condition to check unknow string instead of empty string * update go.mod go.sum * fix lint error * run make gen to update go.sum * add licenses update
* Add remote profile * Update assets
…, tolerations: '[] ->') output (istio#486)
* Prune citadel secrets * Add istio.io/dns-key-and-cert into secret map
* Add statsv2 install option * Address comment * Address comment * Add make gen update
* Turn off DNS certificate provisioning * make update-goldens * make gen-check * Update installer.sha
…s. (istio#476) * Exclude the overridden values when comparing the old with the new ones. * Add --show-overrides flag to show all changed values. * Fix lint. Remove unused recursive params. Reorder flags. * Remove empty lines between imports. * Fix lint, reording imports. * Move genOverlayICPS() to a better place, reducing imports in upgrade.go. * Use the untranslated input as a mask * Improve isPathInTree() func based on PR comments. * Renaming test struct with more readable fields. * Remove --show--overrides as it is a common use case to have seprate flag, and we already have method (profile diff) to archieve it. * Use the existing name.GetFromTreePath() instead of duplicating tree traversals. * Fix rebasing parameter change. * Improve tests, and fix a bug for not matching the leaf path from overrides.
* Fix cryptic messages. * Improve the command examples.
* use force flag for set override * Update test * fix conflict
* Match CRD files in istio/istio * add a newline * add gen files
* Fix duplicate field * update gen
A Googler has manually verified that the CLAs look good. (Googler, please make sure the reason for overriding the CLA status is clearly documented in these comments.) ℹ️ Googlers: Go here for more info. |
1aced67
to
9b6d8d1
Compare
All (the pull request submitter and all commit authors) CLAs are signed, but one or more commits were authored or co-authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that by leaving a comment that contains only Note to project maintainer: There may be cases where the author cannot leave a comment, or the comment is not properly detected as consent. In those cases, you can manually confirm consent of the commit author(s), and set the ℹ️ Googlers: Go here for more info. |
9b6d8d1
to
872f494
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Thank you @howardjohn! look forward to this |
A Googler has manually verified that the CLAs look good. (Googler, please make sure the reason for overriding the CLA status is clearly documented in these comments.) ℹ️ Googlers: Go here for more info. |
This PR executes the merge of these 3 repos as described in GO Monorepo.
The idea here is to move all of installer under manifests/ and all of operator under operator/. Then, we do a
git merge
on both of these into the repo. The end result is we have the two additional folders, with full git history on all the files within. Right now these will not be functional; additional future PRs will clean up redundant files, link everything together correctly, etc.This PR MUST be merged manually with a "Merge PR", or everything will be squashed and history will be lost.
The end result of this PR, after everything is merged via the github UI, can be found here: https://github.com/howardjohn/istio/commits/merge-master-rebase. You can see from the commits page the history of the three repos are interleaved by date, but this is just because github collapses the view. In another git client, we can see the three histories are independant:
The commands used to generate this pr:
Again, this cannot be auto merged! I will use admin override to merge once this has sufficient approval - I would like at least 3 approvals to sanity check what I have done here. To avoid mistakes, I have marked this as a draft until that time