Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ require (
gopkg.in/go-playground/webhooks.v3 v3.13.0
gopkg.in/yaml.v2 v2.3.0
knative.dev/hack v0.0.0-20210203173706-8368e1f6eacf
knative.dev/net-istio v0.20.1-0.20210211111923-d78daae8ad93
knative.dev/net-istio v0.20.1-0.20210219212303-59b2af9679f7
)

replace go.opencensus.io => go.opencensus.io v0.20.2
9 changes: 5 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1099,10 +1099,11 @@ k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl
k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
knative.dev/hack v0.0.0-20210203173706-8368e1f6eacf h1:u4cY4jr2LYvhoz/1HBWEPsMiLkm0HMdDTfmmw1RE8zE=
knative.dev/hack v0.0.0-20210203173706-8368e1f6eacf/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
knative.dev/net-istio v0.20.1-0.20210211111923-d78daae8ad93 h1:0yFVF+TkIUNTZGE6SbaBgyHrVtM/yI5s9C1rzHO9LeA=
knative.dev/net-istio v0.20.1-0.20210211111923-d78daae8ad93/go.mod h1:AcZrCQtvvbLbiacGSsDO7kYvvlR5WlUAybKmGuVDKRg=
knative.dev/networking v0.0.0-20210209171856-855092348016/go.mod h1:NQPUbkM8iJDoeOnSq/LnLfgIq8nID5uPEjstTPWujKE=
knative.dev/pkg v0.0.0-20210208175252-a02dcff9ee26/go.mod h1:TJSdebQOWX5N2bszohOYVi0H1QtXbtlYLuMghAFBMhY=
knative.dev/net-istio v0.20.1-0.20210219212303-59b2af9679f7 h1:gvSi8xifF84Bvgye0LjFECXNeNbJd7kqJ6+x8Clk3IM=
knative.dev/net-istio v0.20.1-0.20210219212303-59b2af9679f7/go.mod h1:QyRaEKLeUgHuFi8g6HAy+4cquaNLYqD/9mhT+Nnqj1U=
knative.dev/networking v0.0.0-20210216014426-94bfc013982b/go.mod h1:Crdn87hxdFd3Jj6PIyrjzGnr8OGHX35k5xo9jlOrjjA=
knative.dev/pkg v0.0.0-20210215165523-84c98f3c3e7a/go.mod h1:TJSdebQOWX5N2bszohOYVi0H1QtXbtlYLuMghAFBMhY=
knative.dev/pkg v0.0.0-20210216013737-584933f8280b/go.mod h1:TJSdebQOWX5N2bszohOYVi0H1QtXbtlYLuMghAFBMhY=
pgregory.net/rapid v0.3.3/go.mod h1:UYpPVyjFHzYBGHIxLFoupi8vwk6rXNzRY9OMvVxFIOU=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
source $(dirname $0)/../download-istio.sh

# Download Istio
download_istio 1.7.7
download_istio 1.8.2
trap cleanup_istio EXIT

# Install Istio
${ISTIO_DIR}/bin/istioctl install -f "$(dirname $0)/$1"
${ISTIO_DIR}/bin/istioctl install -f "$(dirname $0)/$1" -y

# Temporarily disable this (https://github.com/knative-sandbox/net-istio/issues/503)
# Enable mTLS STRICT in mesh mode
if [[ $MESH -eq 1 ]]; then
kubectl apply -f "$(dirname $0)/extra/global-mtls.yaml"
fi
# if [[ $MESH -eq 1 ]]; then
# kubectl apply -f "$(dirname $0)/extra/global-mtls.yaml"
# fi
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ spec:
addonComponents:
pilot:
enabled: true
prometheus:
enabled: false

components:
ingressGateways:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ spec:
addonComponents:
pilot:
enabled: true
prometheus:
enabled: false

components:
ingressGateways:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ spec:
addonComponents:
pilot:
enabled: true
prometheus:
enabled: false

components:
ingressGateways:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ spec:
addonComponents:
pilot:
enabled: true
prometheus:
enabled: false

components:
ingressGateways:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ spec:
addonComponents:
pilot:
enabled: true
prometheus:
enabled: false

components:
ingressGateways:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
/*
Copyright 2020 The Knative Authors
Copyright 2021 The Knative Authors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
https://www.apache.org/licenses/LICENSE-2.0

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

// Package config exists to make the config directory importable.
package config
// Package stable enables the istio configuration to be vendored so that
// downstream repos can vendor configs with `go mod`.
package stable
2 changes: 1 addition & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ gopkg.in/yaml.v2
# knative.dev/hack v0.0.0-20210203173706-8368e1f6eacf
## explicit
knative.dev/hack
# knative.dev/net-istio v0.20.1-0.20210211111923-d78daae8ad93
# knative.dev/net-istio v0.20.1-0.20210219212303-59b2af9679f7
## explicit
knative.dev/net-istio/third_party
knative.dev/net-istio/third_party/istio-stable
Expand Down