Skip to content

Change the installation files for cluster wide#860

Merged
andraxylia merged 17 commits intomasterfrom
yaml
Sep 20, 2017
Merged

Change the installation files for cluster wide#860
andraxylia merged 17 commits intomasterfrom
yaml

Conversation

@andraxylia
Copy link
Copy Markdown
Contributor

@andraxylia andraxylia commented Sep 19, 2017

This is needed to switch to cluster-wide installation files for istio.yaml and istio-auth.yaml.
Installation flow will ask the user to:

  1. Install one of istio.yaml or istio-auth.yaml
  2. Optionally install the istio-initializer.yaml, if cluster has alpha enabled and transparent injection of proxy is desired.

The namespace restricted files used for testing on a shared cluster have been renamed to istio-one-namespace.yaml, respectively istio-one-namespace-auth.yaml.

Updated e2e tests to use the istio-one-namespace* files.

Fixes #146

@istio-merge-robot
Copy link
Copy Markdown

@andraxylia PR needs rebase

@istio-merge-robot istio-merge-robot added needs-rebase Indicates a PR needs to be rebased before being merged release-note labels Sep 19, 2017
@istio-merge-robot istio-merge-robot removed the needs-rebase Indicates a PR needs to be rebased before being merged label Sep 19, 2017
name = "kubernetes",
srcs = [
"istio.yaml",
"istio-auth.yaml",
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

As mentioned over email I think we should keep a single file installing everything in 1 step (with auth)

apiVersion: v1
fieldPath: metadata.namespace
---
--- No newline at end of file
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

make sure all files end properly with a newline (side note we need a linter for that, I keep repeating it in PR after PR)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

why is that? it actually creates ugly resulting concatenated files.

Copy link
Copy Markdown
Member

@ldemailly ldemailly Sep 19, 2017

Choose a reason for hiding this comment

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

@andraxylia no it's the only way to be able to concatenate 2 files properly actually
if you have file A

line1
line2

and file B

line3

if you cat A B and A doesn't have the last newline you'll get

line1
line2line3

which is usually not what you want

it's also a sane convention for a files of X lines to have exactly X newlines, not X-1 and most editors are set by default to, or can be set to, add the missing newlines for you


content = []byte(strings.Replace(string(content),
`args: ["discovery", "-v", "2", "--admission-service", "istio-pilot-external"]`,
`args: ["discovery", "-v", "2", "--admission-service", "istio-pilot-external", "-a", "`+k.Namespace+`"]`,
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

this was almost ready to work with 2 namespaces in shared env

cat $SRC/istio-namespace-ca.yaml.tmpl >> $ISTIO
cp $ISTIO $ISTIO_ONE_NAMESPACE
# restrict pilot controllers to a single namespace in the test file
sed -i=.bak "s|args: \[\"discovery\", \"-v\", \"2\"|args: \[\"discovery\", \"-v\", \"2\", \"-a\", \"${ISTIO_NAMESPACE}\"|" $ISTIO_ONE_NAMESPACE
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

it'd be nice to support in shared env 1 namespace for the app and 1 namespace for istio; but I guess we can change that later

image: gcr.io/istio-testing/pilot:aca4710958367c0ac39e0a890cce599690680414
imagePullPolicy: IfNotPresent
args: ["discovery", "-v", "2", "--admission-service", "istio-pilot-external"]
args: ["discovery", "-v", "2", "-a", "istio-system", "--admission-service", "istio-pilot-external"]
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

it's really weird to watch istio-system - this should be default or app-namespace no ?
(unless we move that file to be for testing only maybe)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

that file is mainly for testing.

If you want to use a different ns, do a sed istio-system.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

let's set it to something else to be replaced so it's not confusing

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

we can generate a file with default, but then we cannot sed properly, default is used in many places.
maybe call it istio-sandbox or istio-app?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

that's not ok, because then the user would not be able to generate with the chosen name. Maybe in a separate commit.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

call it APPNAMESPACE or whatever makes it both easy to replace and clear it needs replacement

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I will think about it, but it is not a priority.

@@ -1,3 +1,5 @@
# GENERATED FILE. Use with Kubernetes 1.7+
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

cool ! thx!

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think that the comments will be removed if I generate this file again? How about updating the README here a bit to reflect this?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

No, they will not be removed.
I will remove this file in a separate commit, it's no longer useful.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I see, thanks @andraxylia

@andraxylia
Copy link
Copy Markdown
Contributor Author

/retest

@andraxylia andraxylia self-assigned this Sep 19, 2017
@andraxylia
Copy link
Copy Markdown
Contributor Author

/retest all

image: gcr.io/istio-testing/istio-ca:87901f278dd40e864b083409dfee9ca72e6a27e9
imagePullPolicy: IfNotPresent
env:
- name: NAMESPACE
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

did that version somehow get accidentally deployed to the shared test cluster ?
(trying to understand how come we have errors in the bad CA sha PR that appear to be bleeding on other PRs)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

No, it has not. Just checked the cluster, there is nothing there.

@andraxylia
Copy link
Copy Markdown
Contributor Author

/test e2e-suite-rbac-auth

@andraxylia
Copy link
Copy Markdown
Contributor Author

/test e2e-suite-rbac-no_auth

@andraxylia andraxylia requested a review from costinm September 19, 2017 17:07
@andraxylia
Copy link
Copy Markdown
Contributor Author

/test e2e-suite-rbac-auth

@andraxylia
Copy link
Copy Markdown
Contributor Author

/test e2e-suite-rbac-no_auth

@ldemailly
Copy link
Copy Markdown
Member

can you update the summary and including adding a rationale for why have 2 files that could stay combined in 1 is an improvement

Alternatively if a pr isn't ready maybe put WIP in the summary until it's ready

@rshriram
Copy link
Copy Markdown
Member

Please provide a description for context.

@istio-merge-robot
Copy link
Copy Markdown

@andraxylia PR needs rebase

@istio-merge-robot istio-merge-robot added the needs-rebase Indicates a PR needs to be rebased before being merged label Sep 19, 2017
data:
mesh: |-
# Uncomment the following line to enable mutual TLS between proxies
# Uncomment the following line to enable mutual encryption
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

leave it as mTLS or as "encryption" but not "mutual encryption" that's meaningless

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

this should be left alone as mTLS. we don't support regular TLS which is also encryption.

#
# Along with discoveryRefreshDelay, this setting determines how
# frequently should Envoy fetch and update its internal configuration
# frequently should Envoy fetch and update its ntiernal configuration
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

spellcheck/typo (review diff)

image: gcr.io/istio-testing/pilot:aca4710958367c0ac39e0a890cce599690680414
imagePullPolicy: IfNotPresent
args: ["discovery", "-v", "2", "--admission-service", "istio-pilot-external"]
args: ["discovery", "-v", "2", "-a", "istio-system", "--admission-service", "istio-pilot-external"]
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

same comment as before

@andraxylia
Copy link
Copy Markdown
Contributor Author

/test istio-presubmit

@andraxylia
Copy link
Copy Markdown
Contributor Author

Addressed the comments, PTAL.

cat $SRC/istio-ns.yaml.tmpl >> $ISTIO
cat $SRC/istio-rbac-beta.yaml.tmpl >> $ISTIO
cat $SRC/istio-mixer.yaml.tmpl >> $ISTIO
cat $SRC/istio-config.yaml.tmpl >> $ISTIO
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Do we also need to update those templates as well by adding the info of GENERATED FILE. Use with Kubernetes 1.7+, @andraxylia

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Not sure what you mean... the templates are not generated.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@gyliu513 see line 134,135 ?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

thanks, got it, then seems this is missing for the $ISTIO_INITIALIZER?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Added it, ptal.

image: gcr.io/istio-testing/pilot:e32cdc4b77175ccc800231e4103ab2b0182ea25d
imagePullPolicy: IfNotPresent
args: ["discovery", "-v", "2", "--admission-service", "istio-pilot-external"]
args: ["discovery", "-v", "2", "-a", "istio-system", "--admission-service", "istio-pilot-external"]
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

it doesn't make sense to watch istio-system (3rd time)

@@ -0,0 +1,66 @@
apiVersion: v1
Copy link
Copy Markdown
Member

@ldemailly ldemailly Sep 20, 2017

Choose a reason for hiding this comment

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

what does the moving from pilot to this new file do ? (it is probably cleaner if that config isn't just about pilot - is it? - but it's not necessary for 0.2?)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Yes, it's much cleaner.

cat $SRC/istio-ns.yaml.tmpl >> $ISTIO
cat $SRC/istio-rbac-beta.yaml.tmpl >> $ISTIO
cat $SRC/istio-mixer.yaml.tmpl >> $ISTIO
cat $SRC/istio-config.yaml.tmpl >> $ISTIO
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@gyliu513 see line 134,135 ?

Copy link
Copy Markdown
Member

@gyliu513 gyliu513 left a comment

Choose a reason for hiding this comment

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

/lgtm

@istio-merge-robot
Copy link
Copy Markdown

@andraxylia PR needs rebase

@istio-merge-robot istio-merge-robot added the needs-rebase Indicates a PR needs to be rebased before being merged label Sep 20, 2017
@istio-merge-robot istio-merge-robot removed the needs-rebase Indicates a PR needs to be rebased before being merged label Sep 20, 2017
@ldemailly
Copy link
Copy Markdown
Member

/retest

Copy link
Copy Markdown
Member

@rshriram rshriram left a comment

Choose a reason for hiding this comment

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

/lgtm

@istio-merge-robot
Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: gyliu513, rshriram

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

Details Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@andraxylia andraxylia merged commit 1c04856 into master Sep 20, 2017
@andraxylia andraxylia changed the title Change the installation files Change the installation files for cluster wide Sep 20, 2017
@andraxylia andraxylia deleted the yaml branch September 21, 2017 17:26
mandarjog pushed a commit to mandarjog/istio that referenced this pull request Oct 30, 2017
Former-commit-id: 388289074b98e51f23ef07d8373634e9ee187594
rshriram pushed a commit that referenced this pull request Oct 30, 2017
* Change the installation files

Former-commit-id: 1c04856
mandarjog pushed a commit that referenced this pull request Oct 31, 2017
Former-commit-id: 49bde5caa5fb136cb3295f01882b1050408759c6
vbatts pushed a commit to vbatts/istio that referenced this pull request Oct 31, 2017
* Change the installation files

Former-commit-id: 1c04856
mandarjog pushed a commit that referenced this pull request Oct 31, 2017
* remove istioctl

* remove remainder

* fix template
mandarjog pushed a commit that referenced this pull request Nov 2, 2017
* Change the installation files

Former-commit-id: 1c04856
0x01001011 pushed a commit to thedemodrive/istio that referenced this pull request Jul 16, 2020
luksa pushed a commit to luksa/istio that referenced this pull request Apr 11, 2024
* OSSM-2378: Use Maistra proxy CentOS Stream 8 img (istio#713)

* OSSM-2378: Use Maistra proxy CentOS Stream 8 img

For integration tests. Based on (istio#609)

* Build container images with docker

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* Use maistra proxy and CentOS Stream 8 as a base image for proxyv2

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* Test VMs using CentOS Stream 8

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* Temporarily skip failing security tests

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* Temporarily skip tests suite telemetry.prometheus.wasm

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* fix(tests): enables fixed integration tests

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>
Co-authored-by: Jacek Ewertowski <jewertow@redhat.com>

* Use our proxy (istio#801)

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* OSSM-5958: Remove wasm extensions (istio#937)

* Do not rely on WASM extensions

Since maistra/proxy#253

* Remove wasm extensions from EnvoyFilters

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* Disable tests for WASM extensions

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* Remove commented code

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

---------

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>
Co-authored-by: Jonh Wendell <jwendell@redhat.com>

* Disable failing tests

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* Fix TestTrustDomainValidation - change expected TLS error to make it work with OpenSSL

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

---------

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>
Co-authored-by: Bartosz Majsak <bartosz.majsak@gmail.com>
Co-authored-by: Jonh Wendell <jonh.wendell@redhat.com>
Co-authored-by: Jonh Wendell <jwendell@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants