Skip to content
This repository was archived by the owner on Jan 23, 2022. It is now read-only.

Fix gometalinter 3.0 errors and update e2e bringup with istio/istio helm changes#88

Merged
john-a-joyce merged 5 commits intoistio:masterfrom
tiswanso:lint_fix
Feb 22, 2019
Merged

Fix gometalinter 3.0 errors and update e2e bringup with istio/istio helm changes#88
john-a-joyce merged 5 commits intoistio:masterfrom
tiswanso:lint_fix

Conversation

@tiswanso
Copy link
Contributor

@tiswanso tiswanso commented Feb 19, 2019

  • per gometalinter 3.0 notes, replace megacheck with staticcheck
  • fix errors found by staticcheck (mostly unused funcs/vars)
  • make the run_e2e.sh script preinstall istio-cni using the PR's helm chart.

- per gometalinter 3.0 notes, replace megacheck with staticcheck
- fix errors found by staticcheck (mostly unused funcs/vars)
@tiswanso tiswanso force-pushed the lint_fix branch 3 times, most recently from 0d556ed to 7e45fb3 Compare February 20, 2019 00:28

helm template --values ${chartdir}/istio-cni/values.yaml --name=istio-cni --namespace=istio-system --set "excludeNamespaces={}" --set hub=${CNI_HUB} --set tag=${CNI_TAG} --set pullPolicy=IfNotPresent --set logLevel=${CNI_LOGLVL:-debug} ${chartdir}/istio-cni > istio-cni_install.yaml

kubectl create ns istio-system
Copy link
Contributor

Choose a reason for hiding this comment

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

Why are you creating the ns here. I don't think that should be required.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

All the changes in this file are WIP. Trying to get the process working. Possibly this should go into istio/istio under a check for enable istio-cni.

But the create ns needs to be done prior to installing the istio-cni daemonset in that ns.


HUB=${HUB} TAG=${TAG} make istioctl

# Remove any pre-existing charts
Copy link
Contributor

Choose a reason for hiding this comment

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

You should remove all istio-cni.X helm settings since the istio-cni chart was removed in 1.1 and presumably will eventually be removed from master. Also since you are installing cni above if either master or the release still has istio-cni integrated things are likely to break. Note also as best I can tell master has not removed the subchart so that is going to make it difficult to test.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yeah... the extra helm settings for istio-cni.X will all change. They don't hurt so I didn't touch the line. This file diff is WIP for now.

@@ -3,11 +3,24 @@
CNI_HUB=${CNI_HUB:-istio}
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this a good default value

@tiswanso tiswanso changed the title Fix gometalinter 3.0 errors Fix gometalinter 3.0 errors and update e2e bringup with istio/istio helm changes Feb 21, 2019
@tiswanso
Copy link
Contributor Author

NOTE: e2e-dind won't work until istio/istio master gets the Istio release1-1 helm charts change.

# Install istio-cni prior to executing the Istio e2e test. Now that the helm chart for istio/istio no longer
# depends on the istio-cni chart, we need to explicitly do these steps.
helm init --client-only
#helm repo add istio.io https://storage.googleapis.com/istio-release/releases/1.1.0-snapshot.6/charts
Copy link
Contributor

Choose a reason for hiding this comment

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

I think you should remove the comments here. Thinking about this more the tests here should be only about using the istio source code not also validating if the the CNI charts have been properly pushed to the istio charts repo. The tests on the istio side can confirm that. In this repo it is probably cleaner if it tests the CNI code AND the CNI charts at the tip of the branch but pull in the Istio code to confirm that.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Is this comment just to remove lines 13 & 14 or to remove all the other comments above? Lines 10 & 11 are still valid comments. I could reword to explain that we're testing with the istio-cni chart from the PR under-test.

Copy link
Contributor

@john-a-joyce john-a-joyce left a comment

Choose a reason for hiding this comment

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

Per the comment I would prefer you remove the comments (and as extra credit comment on the strategy of using the local charts) and we stick to that going forward. Since it is just comment related changes I have no issues if you want to merge as is.

@istio-testing
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
To fully approve this pull request, please assign additional approvers.
We suggest the following additional approver: john-a-joyce

If they are not already assigned, you can assign the PR to them by writing /assign @john-a-joyce in a comment when ready.

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@john-a-joyce john-a-joyce merged commit 57cd53b into istio:master Feb 22, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants