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

Bump master to next version #15555

Closed
wants to merge 7 commits into from
Closed
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
4 changes: 2 additions & 2 deletions Makefile.core.mk
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export IN_BUILD_CONTAINER := $(IN_BUILD_CONTAINER)

# ISTIO_IMAGE_VERSION stores the prefix used by default for the Docker images for Istio.
# For example, a value of 1.6-alpha will assume a default TAG value of 1.6-dev.<SHA>
ISTIO_IMAGE_VERSION ?= 1.23-alpha
ISTIO_IMAGE_VERSION ?= 1.24-alpha
export ISTIO_IMAGE_VERSION

# Determine the SHA for the Istio dependency by parsing the go.mod file.
Expand Down Expand Up @@ -77,7 +77,7 @@ baseurl := "$(URL)"
endif

# Which branch of the Istio source code do we fetch stuff from
export SOURCE_BRANCH_NAME ?= release-1.23
export SOURCE_BRANCH_NAME ?= master

site:
@scripts/gen_site.sh
Expand Down
30 changes: 4 additions & 26 deletions content/en/about/faq/setup/install-method-selection.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,11 @@ The following lists some of the pros and cons of each of the available methods:

- Thorough configuration validation and health verification.
- Uses the `IstioOperator` API which provides extensive configuration/customization options.
- No in-cluster privileged pods needed. Changes are actuated by running the `istioctl` command.

Cons:

- Multiple binaries must be managed, one per Istio minor version.
- The `istioctl` command can set values like `JWT_POLICY` based on your running environment,
- The `istioctl` command can set values automatically based on your running environment,
thereby producing varying installations in different Kubernetes environments.

1. [istioctl manifest generate](/docs/setup/install/istioctl/#generate-a-manifest-before-installation)
Expand All @@ -31,12 +30,12 @@ The following lists some of the pros and cons of each of the available methods:

Pros:

- Resources are generated from the same `IstioOperator` API as used in `istioctl install` and Operator.
- Resources are generated from the same `IstioOperator` API as used in `istioctl install`.
- Uses the `IstioOperator` API which provides extensive configuration/customization options.

Cons:

- Some checks performed in `istioctl install` and Operator are not done.
- Some checks performed in `istioctl install` are not done.
- UX is less streamlined compared to `istioctl install`.
- Error reporting is not as robust as `istioctl install` for the apply step.

Expand All @@ -51,28 +50,7 @@ The following lists some of the pros and cons of each of the available methods:

Cons:

- Fewer checks and validations compared to `istioctl install` and Operator.
- Fewer checks and validations compared to `istioctl install`.
- Some administrative tasks require more steps and have higher complexity.

1. [Istio Operator](/docs/setup/install/operator/)

{{< warning >}}
Using the operator is not recommended for new installations. While the operator will continue to be supported,
new feature requests will not be prioritized.
{{< /warning >}}

The Istio operator provides an installation path without needing the `istioctl` binary.
This can be used for simplified upgrade workflows where running an in-cluster privileged controller is not a concern.
This method is suitable where strict auditing or augmentation of output manifests is not needed.

Pros:

- Same API as `istioctl install` but actuation is through a controller pod in the cluster with a fully declarative operation.
- Uses the `IstioOperator` API which provides extensive configuration/customization options.
- No need to manage multiple `istioctl` binaries.

Cons:

- High privilege controller running in the cluster poses security risks.

Installation instructions for all of these methods are available on the [Istio install page](/docs/setup/install).
5 changes: 2 additions & 3 deletions content/en/boilerplates/helm-preamble.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@
---
The Helm charts for `base` and `istiod` used
in this guide are the same as those used when
installing Istio via [Istioctl](/docs/setup/install/istioctl/) or the
[Operator](/docs/setup/install/operator/).
However installations via Istioctl and the Operator use a different [gateway chart]({{< github_tree >}}/manifests/charts/gateways/istio-ingress) to the [chart]({{< github_tree >}}/manifests/charts/gateway) described in this guide
installing Istio via [Istioctl](/docs/setup/install/istioctl/).
However installations via Istioctl use a different [gateway chart]({{< github_tree >}}/manifests/charts/gateways/istio-ingress) to the [chart]({{< github_tree >}}/manifests/charts/gateway) described in this guide
4 changes: 2 additions & 2 deletions content/en/boilerplates/snips/args.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ v1.1.0
ENDSNIP

! IFS=$'\n' read -r -d '' bpsnip_args_istio_previous_version <<\ENDSNIP
1.22
1.23
ENDSNIP

! IFS=$'\n' read -r -d '' bpsnip_args_istio_full_version <<\ENDSNIP
1.23.0
1.24.0
ENDSNIP
6 changes: 3 additions & 3 deletions content/en/boilerplates/snips/revision-tags-middle.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ istioctl tag list

! IFS=$'\n' read -r -d '' bpsnip_revision_tags_middle__1_out <<\ENDSNIP
TAG REVISION NAMESPACES
default 1-22-1 ...
prod-canary 1-23-0 ...
prod-stable 1-22-1 ...
default 1-23-1 ...
prod-canary 1-24-0 ...
prod-stable 1-23-1 ...
ENDSNIP
6 changes: 3 additions & 3 deletions content/en/docs/ambient/getting-started/cleanup/snips.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ istioctl waypoint delete --all
}

snip_remove_the_sample_application_1() {
kubectl delete -f https://raw.githubusercontent.com/istio/istio/release-1.23/samples/bookinfo/platform/kube/bookinfo.yaml
kubectl delete -f https://raw.githubusercontent.com/istio/istio/release-1.23/samples/bookinfo/platform/kube/bookinfo-versions.yaml
kubectl delete -f https://raw.githubusercontent.com/istio/istio/release-1.23/samples/sleep/sleep.yaml
kubectl delete -f https://raw.githubusercontent.com/istio/istio/master/samples/bookinfo/platform/kube/bookinfo.yaml
kubectl delete -f https://raw.githubusercontent.com/istio/istio/master/samples/bookinfo/platform/kube/bookinfo-versions.yaml
kubectl delete -f https://raw.githubusercontent.com/istio/istio/master/samples/sleep/sleep.yaml
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
####################################################################################################

snip_deploy_the_bookinfo_application_1() {
kubectl apply -f https://raw.githubusercontent.com/istio/istio/release-1.23/samples/bookinfo/platform/kube/bookinfo.yaml
kubectl apply -f https://raw.githubusercontent.com/istio/istio/release-1.23/samples/bookinfo/platform/kube/bookinfo-versions.yaml
kubectl apply -f https://raw.githubusercontent.com/istio/istio/master/samples/bookinfo/platform/kube/bookinfo.yaml
kubectl apply -f https://raw.githubusercontent.com/istio/istio/master/samples/bookinfo/platform/kube/bookinfo-versions.yaml
}

snip_deploy_bookinfo_gateway() {
kubectl apply -f https://raw.githubusercontent.com/istio/istio/release-1.23/samples/bookinfo/gateway-api/bookinfo-gateway.yaml
kubectl apply -f https://raw.githubusercontent.com/istio/istio/master/samples/bookinfo/gateway-api/bookinfo-gateway.yaml
}

snip_annotate_bookinfo_gateway() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ EOF
}

snip_deploy_sleep() {
kubectl apply -f https://raw.githubusercontent.com/istio/istio/release-1.23/samples/sleep/sleep.yaml
kubectl apply -f https://raw.githubusercontent.com/istio/istio/master/samples/sleep/sleep.yaml
}

snip_enforce_layer_4_authorization_policy_3() {
Expand Down
16 changes: 8 additions & 8 deletions content/en/docs/ambient/install/helm-installation/snips.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ helm ls -n istio-system

! IFS=$'\n' read -r -d '' snip_show_components_out <<\ENDSNIP
NAME NAMESPACE REVISION UPDATED STATUS CHART APP VERSION
istio-base istio-system 1 2024-04-17 22:14:45.964722028 +0000 UTC deployed base-1.23.0 1.23.0
istio-cni istio-system 1 2024-04-17 22:14:45.964722028 +0000 UTC deployed cni-1.23.0 1.23.0
istiod istio-system 1 2024-04-17 22:14:45.964722028 +0000 UTC deployed istiod-1.23.0 1.23.0
ztunnel istio-system 1 2024-04-17 22:14:45.964722028 +0000 UTC deployed ztunnel-1.23.0 1.23.0
istio-base istio-system 1 2024-04-17 22:14:45.964722028 +0000 UTC deployed base-1.24.0 1.24.0
istio-cni istio-system 1 2024-04-17 22:14:45.964722028 +0000 UTC deployed cni-1.24.0 1.24.0
istiod istio-system 1 2024-04-17 22:14:45.964722028 +0000 UTC deployed istiod-1.24.0 1.24.0
ztunnel istio-system 1 2024-04-17 22:14:45.964722028 +0000 UTC deployed ztunnel-1.24.0 1.24.0
ENDSNIP

snip_check_pods() {
Expand All @@ -78,10 +78,10 @@ helm ls -n istio-system

! IFS=$'\n' read -r -d '' snip_uninstall_1_out <<\ENDSNIP
NAME NAMESPACE REVISION UPDATED STATUS CHART APP VERSION
istio-base istio-system 1 2024-04-17 22:14:45.964722028 +0000 UTC deployed base-1.23.0 1.23.0
istio-cni istio-system 1 2024-04-17 22:14:45.964722028 +0000 UTC deployed cni-1.23.0 1.23.0
istiod istio-system 1 2024-04-17 22:14:45.964722028 +0000 UTC deployed istiod-1.23.0 1.23.0
ztunnel istio-system 1 2024-04-17 22:14:45.964722028 +0000 UTC deployed ztunnel-1.23.0 1.23.0
istio-base istio-system 1 2024-04-17 22:14:45.964722028 +0000 UTC deployed base-1.24.0 1.24.0
istio-cni istio-system 1 2024-04-17 22:14:45.964722028 +0000 UTC deployed cni-1.24.0 1.24.0
istiod istio-system 1 2024-04-17 22:14:45.964722028 +0000 UTC deployed istiod-1.24.0 1.24.0
ztunnel istio-system 1 2024-04-17 22:14:45.964722028 +0000 UTC deployed ztunnel-1.24.0 1.24.0
ENDSNIP

snip_delete_ingress() {
Expand Down
2 changes: 2 additions & 0 deletions content/en/docs/ambient/usage/waypoint/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ default Active 24h ambient

{{< text syntax=bash snip_id=gen_waypoint_resource >}}
$ istioctl waypoint generate --for service -n default
apiVersion: gateway.networking.k8s.io/v1
kind: Gateway
metadata:
labels:
Expand Down Expand Up @@ -79,6 +80,7 @@ Or, you can deploy the generated Gateway resource:

{{< text syntax=bash >}}
$ kubectl apply -f - <<EOF
apiVersion: gateway.networking.k8s.io/v1
kind: Gateway
metadata:
labels:
Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/examples/virtual-machines/snips.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ sudo systemctl restart mysql
}

snip_running_mysql_on_the_vm_3() {
curl -LO https://raw.githubusercontent.com/istio/istio/release-1.23/samples/bookinfo/src/mysql/mysqldb-init.sql
curl -LO https://raw.githubusercontent.com/istio/istio/master/samples/bookinfo/src/mysql/mysqldb-init.sql
mysql -u root -ppassword < mysqldb-init.sql
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ istioctl analyze samples/bookinfo/networking/bookinfo-gateway.yaml samples/booki
Error [IST0101] (Gateway default/bookinfo-gateway samples/bookinfo/networking/bookinfo-gateway.yaml:9) Referenced selector not found: "istio=ingressgateway"
Error [IST0101] (VirtualService default/bookinfo samples/bookinfo/networking/bookinfo-gateway.yaml:41) Referenced host not found: "productpage"
Error: Analyzers found issues when analyzing namespace: default.
See https://istio.io/v1.23/docs/reference/config/analysis for more information about causes and resolutions.
See https://istio.io/v1.24/docs/reference/config/analysis for more information about causes and resolutions.
ENDSNIP

snip_analyze_networking_directory() {
Expand Down Expand Up @@ -76,7 +76,7 @@ spec:
status:
observedGeneration: "1"
validationMessages:
- documentationUrl: https://istio.io/v1.23/docs/reference/config/analysis/ist0101/
- documentationUrl: https://istio.io/v1.24/docs/reference/config/analysis/ist0101/
level: ERROR
type:
code: IST0101
Expand Down
Loading