v1.14 Backports 2023-08-22

.github/actions/azure/k8s-versions.yaml

@@ -1,13 +1,13 @@
 # List of k8s version for AKS tests
 ---
 include:
-  - version: "1.24"
+  - version: "1.25"
     location: westeurope
     index: 1
-  - version: "1.25"
+  - version: "1.26"
     location: westus
     index: 2
-  - version: "1.26"
+  - version: "1.27"
     location: eastasia
     index: 3
     default: true

.github/actions/gke/k8s-versions.yaml

@@ -1,22 +1,19 @@
 # List of k8s version for GKE tests
 ---
 k8s:
-  - version: "1.22"
-    zone: northamerica-northeast1-c
-    vmIndex: 1
   - version: "1.23"
     zone: europe-west6-b
-    vmIndex: 2
+    vmIndex: 1
   - version: "1.24"
     zone: us-west2-a
-    vmIndex: 3
+    vmIndex: 2
   - version: "1.25"
     zone: asia-northeast1-c
-    vmIndex: 4
+    vmIndex: 3
   - version: "1.26"
     zone: europe-north1-b
-    vmIndex: 5
+    vmIndex: 4
   - version: "1.27"
     zone: us-east5-a
-    vmIndex: 6
+    vmIndex: 5
     default: true

.github/workflows/conformance-ginkgo.yaml

@@ -83,7 +83,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set initial commit status
-        uses: myrotvorets/set-commit-status-action@243b4f7e597f62335408d58001edf8a02cf3e1fd # v1.1.7  
+        uses: myrotvorets/set-commit-status-action@243b4f7e597f62335408d58001edf8a02cf3e1fd # v1.1.7
         with:
           sha: ${{ inputs.SHA || github.sha }}
 
@@ -149,7 +149,7 @@ jobs:
   wait-for-images:
     needs: setup-vars
     runs-on: ubuntu-latest
-    name: Build Ginkgo E2E
+    name: Wait for images
     timeout-minutes: 30
     steps:
       - name: Checkout context ref (trusted)
@@ -223,7 +223,7 @@ jobs:
           echo "matrix=$(jq -c . < /tmp/merged.json)" >> $GITHUB_OUTPUT
 
   setup-and-test:
-    needs: [setup-vars, build-ginkgo-binary, generate-matrix]
+    needs: [setup-vars, build-ginkgo-binary, generate-matrix, wait-for-images]
     runs-on:
       group: ginkgo-runners
     timeout-minutes: 35
@@ -461,8 +461,21 @@ jobs:
     needs: setup-and-test
     runs-on: ubuntu-latest
     steps:
+      - name: Determine final commit status
+        id: commit-status
+        shell: bash
+        run: |
+          # When one of the prerequisites of setup-and-test fails, then that
+          # job gets skipped. Let's convert the status so that we correctly
+          # report that as a proper failure.
+          if [ "${{ needs.setup-and-test.result }}" != "skipped" ]; then
+            echo "status=${{ needs.setup-and-test.result }}" >> $GITHUB_OUTPUT
+          else
+            echo "status=failure" >> $GITHUB_OUTPUT
+          fi
+
       - name: Set final commit status
-        uses: myrotvorets/set-commit-status-action@243b4f7e597f62335408d58001edf8a02cf3e1fd # v1.1.7  
+        uses: myrotvorets/set-commit-status-action@243b4f7e597f62335408d58001edf8a02cf3e1fd # v1.1.7
         with:
           sha: ${{ inputs.SHA || github.sha }}
-          status: ${{ needs.setup-and-test.result }}
+          status: ${{ steps.commit-status.outputs.status }}

.github/workflows/tests-ipsec-upgrade.yaml

@@ -52,9 +52,8 @@ concurrency:
 
 env:
   # renovate: datasource=github-releases depName=cilium/cilium-cli
-  cilium_cli_version:
-  # until https://github.com/cilium/cilium-cli/pull/1854 has been released
-  cilium_cli_ci_version: 8c624e141844a19a6b2e21d5255f3ca6195c996d
+  cilium_cli_version: v0.15.5
+  cilium_cli_ci_version:
   check_url: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
   cilium_stable_version: 1.13
 

Documentation/Makefile

@@ -110,7 +110,7 @@ $(HELM_VALUES): FORCE
 	$(QUIET)$(HELM_DOCS) -d -c $(HELM_DOCS_CHARTS_DIR) -t $(HELM_DOCS_OUTPUT_DIR)/$(TMP_FILE_1).tmpl > $(TMP_FILE_1)
 	$(QUIET)awk -F'|' '{print "|"$$2"|"$$5"|"$$3"|"$$4"|"}' $(TMP_FILE_1) > $(TMP_FILE_2)
 	$(QUIET)$(M2R) --overwrite $(TMP_FILE_2)
-	$(QUIET)$(SED) 's/^\(   \* - \)\([[:print:]]\+\)$$/\1:spelling:ignore:`\2`/' $@ > $(TMP_FILE_3)
+	$(QUIET)$(SED) 's/^\(   \* - \)\([[:print:]]\{1,\}\)$$/\1:spelling:ignore:`\2`/' $@ > $(TMP_FILE_3)
 	$(QUIET)printf '..\n  %s\n\n%s\n' "AUTO-GENERATED. Please DO NOT edit manually." "$$(cat $(TMP_FILE_3))" > $@
 	$(QUIET)$(RM) -- $(TMP_FILE_1) $(TMP_FILE_2) $(TMP_FILE_3)
 

Documentation/bpf/toolchain.rst

@@ -144,7 +144,8 @@ In order to run through all BPF selftests, the following command is needed:
 
     $ sudo make run_tests
 
-If you see any failures, please contact us on Slack with the full test output.
+If you see any failures, please contact us on `Cilium Slack`_ with the full
+test output.
 
 Compiling iproute2
 ``````````````````

Documentation/check-build.sh

@@ -100,10 +100,13 @@ run_linter() {
 
     CONF_PY_ROLES=$(sed -n "/^extlinks = {$/,/^}$/ s/^ *'\([^']\+\)':.*/\1/p" conf.py | tr '\n' ',')
     CONF_PY_SUBSTITUTIONS="$(sed -n 's/^\.\. |\([^|]\+\)|.*/\1/p' conf.py | tr '\n' ',')release"
+    CONF_PY_TARGET_NAMES="(cilium slack)"
     ignored_messages="("
     ignored_messages="${ignored_messages}bpf/.*\.rst:.*: \(INFO/1\) Enumerated list start value not ordinal"
     ignored_messages="${ignored_messages}|Hyperlink target .*is not referenced\."
     ignored_messages="${ignored_messages}|Duplicate implicit target name:"
+    ignored_messages="${ignored_messages}|\(ERROR/3\) Indirect hyperlink target \".*\"  refers to target \"${CONF_PY_TARGET_NAMES}\", which does not exist."
+    ignored_messages="${ignored_messages}|\(ERROR/3\) Unknown target name: \"${CONF_PY_TARGET_NAMES}\"."
     ignored_messages="${ignored_messages})"
     # Filter out the AttributeError reports that are due to a bug in rstcheck,
     # see https://github.com/rstcheck/rstcheck-core/issues/3.

Documentation/community/community.rst

@@ -20,70 +20,70 @@ Zoom call open to everyone. During that time, we discuss:
 If you want to discuss something during the next meeting's open session,
 you can add it to `the meeting's Google doc
 <https://docs.google.com/document/d/1Y_4chDk4rznD6UgXPlPvn3Dc7l-ZutGajUv1eF0VDwQ/edit#>`_.
-The Zoom link to the meeting is available in the #development Slack
+The Zoom link to the meeting is available in the ``#development`` Slack
 channel and in `the meeting notes
 <https://docs.google.com/document/d/1Y_4chDk4rznD6UgXPlPvn3Dc7l-ZutGajUv1eF0VDwQ/edit#>`_.
 
 Slack
 =====
 
-Our Cilium & eBPF Slack is the main discussion space for the Cilium community.
-Click `here <https://cilium.herokuapp.com>`_ to request an invite.
+Our `Cilium & eBPF Slack <Cilium Slack_>`_ is the main discussion space for the
+Cilium community.
 
 Slack channels
 --------------
 
-==================== ==========================================================
-Name                 Purpose
-==================== ==========================================================
-#general             General user discussions & questions
-#hubble              Questions on Hubble
-#kubernetes          Kubernetes-specific questions
-#networkpolicy       Questions on network policies
-#release             Release announcements only
-#service-mesh        Questions on Cilium Service Mesh
-#tetragon            Questions on Tetragon
-==================== ==========================================================
+======================== ======================================================
+Name                     Purpose
+======================== ======================================================
+``#general``             General user discussions & questions
+``#hubble``              Questions on Hubble
+``#kubernetes``          Kubernetes-specific questions
+``#networkpolicy``       Questions on network policies
+``#release``             Release announcements only
+``#service-mesh``        Questions on Cilium Service Mesh
+``#tetragon``            Questions on Tetragon
+======================== ======================================================
 
 You can join the following channels if you are looking to contribute to
 Cilium code, documentation, or website:
 
-==================== ==========================================================
-Name                 Purpose
-==================== ==========================================================
-#development         Development discussions around Cilium
-#ebpf-go-dev         Development discussion for the `eBPF Go library`_
-#git                 GitHub notifications
-#sig-*               SIG-specific discussions (see below)
-#testing             Testing and CI discussions
-#cilium-website      Development discussions around cilium.io
-==================== ==========================================================
+======================== ======================================================
+Name                     Purpose
+======================== ======================================================
+``#development``         Development discussions around Cilium
+``#ebpf-go-dev``         Development discussion for the `eBPF Go library`_
+``#git``                 GitHub notifications
+``#sig-``\*              SIG-specific discussions (see below)
+``#testing``             Testing and CI discussions
+``#cilium-website``      Development discussions around cilium.io
+======================== ======================================================
 
 If you are interested in eBPF, then the following channels are for you:
 
-==================== ==========================================================
-Name                 Purpose
-==================== ==========================================================
-#ebpf                General eBPF questions
-#ebpf-go             Questions on the `eBPF Go library`_
-#ebpf-lsm            Questions on BPF Linux Security Modules (LSM)
-#echo-news           Contributions to `eCHO News`_
-#ebpf-for-windows    Discussions around eBPF for Windows
-==================== ==========================================================
+======================== ======================================================
+Name                     Purpose
+======================== ======================================================
+``#ebpf``                General eBPF questions
+``#ebpf-go``             Questions on the `eBPF Go library`_
+``#ebpf-lsm``            Questions on BPF Linux Security Modules (LSM)
+``#echo-news``           Contributions to `eCHO News`_
+``#ebpf-for-windows``    Discussions around eBPF for Windows
+======================== ======================================================
 
 .. _eBPF Go library: https://github.com/cilium/ebpf
 .. _eCHO News: https://cilium.io/newsletter/
 
 Our Slack hosts channels for eBPF and Cilium-related events online and in
 person.
 
-==================== ==========================================================
-Name                 Purpose
-==================== ==========================================================
-#ciliumcon           CiliumCon
-#ctf                 Cilium and eBPF capture-the-flag challenges
-#ebpf-summit         eBPF Summit
-==================== ==========================================================
+======================== ======================================================
+Name                     Purpose
+======================== ======================================================
+``#ciliumcon``           CiliumCon
+``#ctf``                 Cilium and eBPF capture-the-flag challenges
+``#ebpf-summit``         eBPF Summit
+======================== ======================================================
 
 How to create a Slack channel
 -----------------------------
@@ -94,7 +94,7 @@ How to create a Slack channel
 4. Find two Cilium committers to comment in the issue that they approve the
    creation of the Slack channel
 5. Not all Slack channels need to be listed on this page, but you can submit a
-   PR if you would like to include it here. 
+   PR if you would like to include it here.
 
 Special Interest Groups
 =======================
@@ -106,16 +106,16 @@ The following is a list of special interest groups (SIG) that are meeting on a
 regular interval. See the respective slack channel for exact meeting cadence
 and meeting links.
 
-====================== ===================================== ============= ================================================================================
-SIG                    Meeting                               Slack         Description
-====================== ===================================== ============= ================================================================================
-Datapath               On demand                             #sig-datapath Development discussions for Linux and eBPF code used in Cilium.
-Documentation          None                                  #sig-docs     Documentation, Helm references, and translations.
-Envoy                  On demand                             #sig-envoy    Envoy, Istio and maintenance of all L7 protocol parsers.
-Hubble                 During community meeting              #sig-hubble   All Hubble-related code: Server, UI, CLI and Relay.
-Policy                 None                                  #sig-policy   Network policy and enforcement.
-Release Management     None                                  #launchpad    Release management and backport coordination.
-====================== ===================================== ============= ================================================================================
+====================== ===================================== ================= ============================================================================
+SIG                    Meeting                               Slack             Description
+====================== ===================================== ================= ============================================================================
+Datapath               On demand                             ``#sig-datapath`` Development discussions for Linux and eBPF code used in Cilium.
+Documentation          None                                  ``#sig-docs``     Documentation, Helm references, and translations.
+Envoy                  On demand                             ``#sig-envoy``    Envoy, Istio and maintenance of all L7 protocol parsers.
+Hubble                 During community meeting              ``#sig-hubble``   All Hubble-related code: Server, UI, CLI and Relay.
+Policy                 None                                  ``#sig-policy``   Network policy and enforcement.
+Release Management     None                                  ``#launchpad``    Release management and backport coordination.
+====================== ===================================== ================= ============================================================================
 
 How to create a SIG
 -------------------
@@ -124,6 +124,6 @@ How to create a SIG
 2. Specify the title "SIG-Request: <Name>"
 3. Provide a description
 4. Find two Cilium committers to support the SIG.
-5. Ask on #development to get the Slack channel and Zoom meeting created
+5. Ask on ``#development`` to get the Slack channel and Zoom meeting created
 6. Submit a PR to update the documentation to get your new SIG listed
 

Documentation/community/governance/commit_access.rst

@@ -130,11 +130,13 @@ The Maintainers may also choose to delegate working with the CNCF to non-Maintai
 Code of Conduct
 ~~~~~~~~~~~~~~~
 
-`Code of Conduct <https://github.com/cilium/cilium/blob/main/CODE_OF_CONDUCT.md>`__
-violations by community members will be discussed and resolved on the private
-committers Slack channel. If the reported Code of Conduct violator is a Maintainer, the 
-Maintainers will instead designate two Maintainers to work with the
-`CNCF CoC Committee <https://www.cncf.io/conduct/procedures/>`__.  
+`Code of Conduct`_ violations by community members will be discussed and
+resolved on the private committers channel on `Cilium Slack`_. If the reported
+Code of Conduct violator is a Maintainer, the Maintainers will instead
+designate two Maintainers to work with the `CNCF CoC Committee`_.
+
+.. _Code of Conduct: https://github.com/cilium/cilium/blob/main/CODE_OF_CONDUCT.md
+.. _CNCF CoC Committee: https://www.cncf.io/conduct/procedures/
 
 Granting Commit Access
 ----------------------
@@ -165,7 +167,7 @@ demonstrated the following in their interaction with the project:
 The process to grant commit access to a candidate is simple:
 
 -  An existing committer nominates the candidate by sending a message in the
-   #committers Slack channel to all existing committers with information
+   ``#committers`` Slack channel to all existing committers with information
    substantiating the contributions of the candidate in the areas described
    above.
 
@@ -203,7 +205,7 @@ The process to grant commit access to a candidate is simple:
        discussion, those remarks may optionally be summarized and re-posted
        to the channel. The final vote summary does not need to be deleted.
 
-    #. Invite the new committer to the #committers Slack channel.
+    #. Invite the new committer to the ``#committers`` Slack channel.
 
     #. Add the new committer to the list in MAINTAINERS.md_.
 
@@ -349,8 +351,8 @@ decide an issue. If the maintainers themselves cannot decide an issue, the
 issue will be resolved by voting. The voting process is a simple majority in
 which each committer and each maintainer receives one vote.
 
-Votes are done in the Slack channel #committers using Slack polls. A failure to
-vote is an implicit abstention.
+Votes are done in the Slack channel ``#committers`` using Slack polls. A
+failure to vote is an implicit abstention.
 
 .. _vote_limit:
 

Documentation/community/roadmap.rst

@@ -171,15 +171,18 @@ production.
 Codebase modularization
 ~~~~~~~~~~~~~~~~~~~~~~~
 
-As the project is growing in complexity it is becoming increasingly important to be able
-to divide it into more manageable chunks. To achieve this, we're working on modularizing the
-codebase and going from a tightly coupled design (one large initialization and configuration)
-to a more loosely coupled design of mostly self-contained modules. This will make Cilium 
-internals easier to comprehend, test and extend. 
-
-Contributions in this area are very welcome. To get started, take a look at the :ref:`guide-to-the-hive`
-documentation and the issues referenced from `modularization meta issue <modularization-issue_>`_.
-If you have any questions or ideas please join us on the #sig-modularization channel on `Cilium Slack <slack_>`_.
+As the project is growing in complexity it is becoming increasingly important
+to be able to divide it into more manageable chunks. To achieve this, we're
+working on modularizing the codebase and going from a tightly coupled design
+(one large initialization and configuration) to a more loosely coupled design
+of mostly self-contained modules. This will make Cilium internals easier to
+comprehend, test and extend.
+
+Contributions in this area are very welcome. To get started, take a look at the
+:ref:`guide-to-the-hive` documentation and the issues referenced from
+`modularization meta issue <modularization-issue_>`_. If you have any questions
+or ideas please join us on the ``#sig-modularization`` channel on `Cilium
+Slack`_.
 
 .. _rm-influence:
 
@@ -199,8 +202,8 @@ details of our pull request process and expectations, along with instructions
 for setting up your development environment.
 
 We encourage you to discuss your ideas for significant enhancements and feature
-requests on the #development channel on `Cilium Slack <slack_>`_, bring them to
-the :ref:`weekly-community-meeting`, and/or create a `CFP design doc`_.
+requests on the ``#development`` channel on `Cilium Slack`_, bring them to the
+:ref:`weekly-community-meeting`, and/or create a `CFP design doc`_.
 
 This roadmap does not give date commitments since the work is dependent on the
 community. If you're looking for commitments to apply engineering resources to
@@ -226,7 +229,6 @@ anything other than trivial fixes.
 .. _Hubble OpenTelemetry collector: https://github.com/cilium/hubble-otel
 .. _CI improvements: https://github.com/cilium/cilium/issues?q=is%3Aopen+is%3Aissue+label%3Aarea%2FCI-improvement
 .. _good-first-issue: https://github.com/cilium/cilium/labels/good-first-issue
-.. _slack: https://cilium.io/slack
 .. _enterprise: https://cilium.io/enterprise
 .. _CFP design doc: https://github.com/cilium/design-cfps/tree/main
 .. _modularization-issue: https://github.com/cilium/cilium/issues/23425