Bump master to next version (istio#15595)

* Bump master to next version * remove link to removed IstioOperator doc * disable operator test * improve test * Add back operator doc * fix version * drop operator * bump version * snips * fix * fix lint * Add redirect * Kick GitHub * fix lint * I hope this isn't genchecked * fix Gateway API test * bump again * fix cleanup Signed-off-by: Faseela K <[email protected]> * fix cleanup Signed-off-by: Faseela K <[email protected]> * fix multicluster cleanup Signed-off-by: Faseela K <[email protected]> * disable skywalking test Signed-off-by: Faseela K <[email protected]> * fix spire and multiple controlplane tests Signed-off-by: Faseela K <[email protected]> --------- Signed-off-by: Faseela K <[email protected]> Co-authored-by: Craig Box <[email protected]> Co-authored-by: Faseela K <[email protected]>
wilsonwu · Sep 12, 2024 · 9a980a9 · 9a980a9
1 parent b747b29
commit 9a980a9
Show file tree

Hide file tree

Showing 75 changed files with 1,155 additions and 11,532 deletions.
diff --git a/Makefile.core.mk b/Makefile.core.mk
@@ -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.
@@ -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

diff --git a/content/en/about/faq/setup/install-method-selection.md b/content/en/about/faq/setup/install-method-selection.md
@@ -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)
@@ -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.
 
@@ -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).
diff --git a/content/en/blog/2019/introducing-istio-operator/index.md b/content/en/blog/2019/introducing-istio-operator/index.md
@@ -108,7 +108,7 @@ resource and reacts to changes by updating the Istio installation configuration
 
 In the 1.4 release, the Istio controller is in the alpha phase of development and not fully
 integrated with `istioctl`. It is, however,
-[available for experimentation](/docs/setup/install/operator/) using `kubectl` commands.
+[available for experimentation](https://archive.istio.io/v1.23/docs/setup/install/operator/) using `kubectl` commands.
 For example, to install the controller and a default version of Istio into your cluster,
 run the following command:
 

diff --git a/content/en/blog/2024/in-cluster-operator-deprecation-announcement/index.md b/content/en/blog/2024/in-cluster-operator-deprecation-announcement/index.md
@@ -10,7 +10,7 @@ Istio’s In-Cluster Operator has been deprecated in Istio 1.23.  Users leveragi
 
 ## Does this affect you?
 
-This deprecation only affects users of the [In-Cluster Operator](/docs/setup/install/operator/).  **Users who install Istio with the <code>istioctl install</code> command and an `IstioOperator` YAML file are not affected**.
+This deprecation only affects users of the [In-Cluster Operator](https://archive.istio.io/v1.23/docs/setup/install/operator/).  **Users who install Istio with the <code>istioctl install</code> command and an `IstioOperator` YAML file are not affected**.
 
 To determine if you are affected, run `kubectl get deployment -n istio-system istio-operator` and `kubectl get IstioOperator`.  If both commands return non-empty values, your cluster will be affected. Based on recent polls, we expect that this will affect fewer than 10% of Istio users.
 

diff --git a/content/en/boilerplates/helm-preamble.md b/content/en/boilerplates/helm-preamble.md
@@ -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
diff --git a/content/en/boilerplates/snips/args.sh b/content/en/boilerplates/snips/args.sh
@@ -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
diff --git a/content/en/boilerplates/snips/revision-tags-middle.sh b/content/en/boilerplates/snips/revision-tags-middle.sh
@@ -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
diff --git a/content/en/docs/ambient/getting-started/cleanup/snips.sh b/content/en/docs/ambient/getting-started/cleanup/snips.sh
@@ -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
 }
diff --git a/content/en/docs/ambient/getting-started/deploy-sample-app/snips.sh b/content/en/docs/ambient/getting-started/deploy-sample-app/snips.sh
@@ -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() {

diff --git a/content/en/docs/ambient/getting-started/enforce-auth-policies/snips.sh b/content/en/docs/ambient/getting-started/enforce-auth-policies/snips.sh
@@ -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() {

diff --git a/content/en/docs/ambient/install/helm/snips.sh b/content/en/docs/ambient/install/helm/snips.sh
@@ -56,10 +56,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() {
@@ -79,10 +79,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() {

diff --git a/content/en/docs/ambient/usage/waypoint/index.md b/content/en/docs/ambient/usage/waypoint/index.md
@@ -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:
@@ -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:

diff --git a/content/en/docs/ambient/usage/waypoint/snips.sh b/content/en/docs/ambient/usage/waypoint/snips.sh
@@ -37,6 +37,7 @@ istioctl waypoint generate --for service -n default
 }
 
 ! IFS=$'\n' read -r -d '' snip_gen_waypoint_resource_out <<\ENDSNIP
+apiVersion: gateway.networking.k8s.io/v1
 kind: Gateway
 metadata:
   labels:
@@ -61,6 +62,7 @@ ENDSNIP
 
 snip_deploy_a_waypoint_proxy_4() {
 kubectl apply -f - <<EOF
+apiVersion: gateway.networking.k8s.io/v1
 kind: Gateway
 metadata:
   labels:

diff --git a/content/en/docs/examples/virtual-machines/snips.sh b/content/en/docs/examples/virtual-machines/snips.sh
@@ -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
 }
 

diff --git a/content/en/docs/ops/diagnostic-tools/istioctl-analyze/snips.sh b/content/en/docs/ops/diagnostic-tools/istioctl-analyze/snips.sh
@@ -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() {
@@ -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

diff --git a/content/en/docs/ops/integrations/spire/index.md b/content/en/docs/ops/integrations/spire/index.md
@@ -162,7 +162,6 @@ Below are the equivalent manual registrations based off the automatic registrati
       meshConfig:
         trustDomain: example.org
       values:
-        global:
         # This is used to customize the sidecar template.
         # It adds both the label to indicate that SPIRE should manage the
         # identity of this pod, as well as the CSI driver mounts.

diff --git a/content/en/docs/ops/integrations/spire/snips.sh b/content/en/docs/ops/integrations/spire/snips.sh
@@ -104,7 +104,6 @@ spec:
   meshConfig:
     trustDomain: example.org
   values:
-    global:
     # This is used to customize the sidecar template.
     # It adds both the label to indicate that SPIRE should manage the
     # identity of this pod, as well as the CSI driver mounts.
-Original file 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
-.22
+.23
     ENDSNIP
     ! IFS=$'\n' read -r -d '' bpsnip_args_istio_full_version <<\ENDSNIP
-.23.0
+.24.0
     ENDSNIP