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.

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

Merged
merged 1,122 commits into from Jan 13, 2020

Conversation

howardjohn
Copy link
Member

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:

*   b7f3e4631 "John Howard" <howardjohn@google.com> 5 minutes ago (HEAD -> merge-master-rebase, origin/merge-master-rebase)
|\  Merge pull request #19 from howardjohn/merge-operator-and-installer
| *   854e76197 "John Howard" <howardjohn@google.com> 6 minutes ago (origin/merge-operator-and-installer, merge-operator-and-installer)
| |\  Merge branch 'operator-consolidate' into merge-operator-and-installer
| * | 7943f8cfe "John Howard" <howardjohn@google.com> 7 minutes ago
|/| | Merge branch 'installer-consolidate' into merge-operator-and-installer
| | * 83455e762 "John Howard" <howardjohn@google.com> 7 minutes ago (operator-consolidate)
| | | Move everything under operator/
| * | 80fc771a5 "John Howard" <howardjohn@google.com> 7 minutes ago (installer-consolidate)
| | | Move everything under manifests/
| | * dc2f1b31f "Morven Cao" <llcao@cn.ibm.com> 5 hours ago (operator/master)
| | | add serviceAnnotation to KubernetesResourcesSpec. (#740)
| | * ad0f33310 "Morven Cao" <llcao@cn.ibm.com> 5 hours ago
| | | remove dynamic rest mapper from openshift. (#744)
| | * 4b27ee661 "Morven Cao" <llcao@cn.ibm.com> 6 hours ago
| | | fix iop status update issue. (#741)
* | | 89d5d07bd "Rama Chavali" <rama.rao@salesforce.com> 17 hours ago (origin/master, origin/HEAD, master)
| | | eds: remove inefficient get service calls while updating service shards (#20020)
* | | 176eb7af8 "Jason Young" <jasonyoung@google.com> 2 days ago
| | | Make galley use the new webhook controller and server packages (2 of 3) (#19984)
* | | e4cddc7a2 "Diem Vu" <25132401+diemtvu@users.noreply.github.com> 2 days ago
| | | Add e2e tests to verify JWT and JWT payload are output/prune as set correctly (#20050)
* | | e3aab7c01 "Shawn Rebello" <shawn.nigel@gmail.com> 2 days ago
| | | Added test for Traffic Shifting task (#19606)
* | | ae817fccf "Yuchen Dai" <silentdai@gmail.com> 2 days ago
| | | add a iptables failure detector, default off (#19534)
* | | 9dd53b96a "Zhranklin" <chigou79@outlook.com> 2 days ago
| | | Fix a group of mixer attributes generated from k8s when pod name contains dot (#20026)
* | | b3d83c6fa "Stefan Siegl" <stesie@brokenpipe.de> 2 days ago
| | | Fix segfaults: unaligned atomics on 32bit architectures (#19595)
* | | 6410b0dec "Nathan Mittler" <nmittler@gmail.com> 2 days ago
| | | Set Metrics in kube controller (#20083)

The commands used to generate this pr:

git clone https://github.com/howardjohn/istio
cd istio

git remote add installer https://github.com/howardjohn/istio-installer
git fetch installer
git checkout installer/master
git checkout -b installer-consolidate
mkdir manifests
mv * manifests
mv .gitattributes .gitignore .drone.yml .concourse manifests
git add -A
git commit -m "Move everything under manifests/"

git remote add operator https://github.com/howardjohn/operator
git fetch operator
git checkout operator/master
git checkout -b operator-consolidate
mkdir operator
mv * operator
mv .gitattributes .gitignore .codecov.yml operator
git add -A
git commit -m "Move everything under operator/"

git checkout master
git checkout -b merge-operator-and-installer
git merge --allow-unrelated-histories installer-consolidate
git merge --allow-unrelated-histories operator-consolidate

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

geeknoid and others added 30 commits October 25, 2019 19:46
* 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
* 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
@googlebot
Copy link
Collaborator

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.

@googlebot
Copy link
Collaborator

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 @googlebot I consent. in this pull request.

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 cla label to yes (if enabled on your project).

ℹ️ Googlers: Go here for more info.

@googlebot googlebot added cla: no Set by the Google CLA bot to indicate the author of a PR has not signed the Google CLA. and removed cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. labels Jan 12, 2020
@sdake sdake marked this pull request as ready for review January 13, 2020 02:05
@istio-testing istio-testing removed the do-not-merge/work-in-progress Block merging of a PR because it isn't ready yet. label Jan 13, 2020
Copy link
Member

@sdake sdake left a comment

Choose a reason for hiding this comment

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

LGTM

@sdake sdake added the do-not-merge/work-in-progress Block merging of a PR because it isn't ready yet. label Jan 13, 2020
@howardjohn howardjohn added do-not-merge Block automatic merging of a PR. do-not-merge/hold Block automatic merging of a PR. labels Jan 13, 2020
@howardjohn howardjohn changed the title [DO NOT MERGE] Merge istio/installer and istio/operator into istio/istio WIP Merge istio/installer and istio/operator into istio/istio Jan 13, 2020
@linsun
Copy link
Member

linsun commented Jan 13, 2020

Thank you @howardjohn! look forward to this

@howardjohn howardjohn added cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. and removed cla: no Set by the Google CLA bot to indicate the author of a PR has not signed the Google CLA. labels Jan 13, 2020
@howardjohn howardjohn merged commit ac2ce64 into istio:master Jan 13, 2020
@howardjohn howardjohn deleted the merge-operator-and-installer branch January 13, 2020 18:57
@googlebot
Copy link
Collaborator

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.

@howardjohn howardjohn changed the title WIP Merge istio/installer and istio/operator into istio/istio Merge istio/installer and istio/operator into istio/istio Aug 21, 2020
@istio-testing istio-testing removed the do-not-merge/work-in-progress Block merging of a PR because it isn't ready yet. label Aug 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. do-not-merge/hold Block automatic merging of a PR. do-not-merge Block automatic merging of a PR. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet