fluxcd · Oct 24, 2022 · Oct 24, 2022 · Oct 24, 2022 · Oct 24, 2022 · Oct 24, 2022
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Restore Go cache
         uses: actions/cache@v3.0.11
         with:

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -35,7 +35,7 @@ jobs:
           - keda
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Setup Kubernetes
         uses: engineerd/setup-kind@v0.5.0
         with:

diff --git a/.github/workflows/helm.yaml b/.github/workflows/helm.yaml
@@ -12,7 +12,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Publish Helm charts
         uses: stefanprodan/helm-gh-pages@v1.6.0
         with:

diff --git a/.github/workflows/push-ld.yml b/.github/workflows/push-ld.yml
@@ -29,7 +29,7 @@ jobs:
         id: buildx
         uses: docker/setup-buildx-action@v2
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: fluxcdbot
@@ -43,7 +43,7 @@ jobs:
           tags: |
             type=raw,value=${{ steps.prep.outputs.VERSION }}
       - name: Publish image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           push: true
           builder: ${{ steps.buildx.outputs.name }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -49,7 +49,7 @@ jobs:
           tags: |
             type=raw,value=${{ steps.prep.outputs.VERSION }}
       - name: Publish image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           push: true
           builder: ${{ steps.buildx.outputs.name }}
@@ -93,7 +93,7 @@ jobs:
           cosign sign ghcr.io/fluxcd/flagger-manifests:${{ steps.prep.outputs.VERSION }}
       - uses: anchore/sbom-action/download-syft@v0
       - name: Create release and SBOM
-        uses: goreleaser/goreleaser-action@v2
+        uses: goreleaser/goreleaser-action@v3
         with:
           version: latest
           args: release --release-notes=notes.md --rm-dist --skip-validate

diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml
@@ -17,7 +17,7 @@ jobs:
     permissions:
       security-events: write
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Run FOSSA scan and upload build data
         uses: fossa-contrib/fossa-action@v1
         with:
@@ -30,12 +30,12 @@ jobs:
       security-events: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
+        uses: github/codeql-action/init@v2
         with:
           languages: go
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v1
+        uses: github/codeql-action/autobuild@v2
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
+        uses: github/codeql-action/analyze@v2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,19 @@
 
 All notable changes to this project are documented in this file.
 
+## 1.24.1
+
+**Release date:** 2022-10-26
+
+This release comes with a fix to Gloo routing when a custom service name id used.
+
+In addition, the Gloo ingress end-to-end testing was updated to Gloo Helm chart v1.12.31.
+
+#### Fixes:
+
+- fix(gloo): Use correct route table name in case service name was overwritten
+  [#1300](https://github.com/fluxcd/flagger/pull/1300)
+
 ## 1.24.0
 
 **Release date:** 2022-10-23

diff --git a/README.md b/README.md
@@ -260,7 +260,7 @@ When submitting bug reports please include as many details as possible:
 Here is a list of good entry points into our community, how we stay in touch and how you can meet us as a team.
 
 - Slack: Join in and talk to us in the `#flagger` channel on [CNCF Slack](https://slack.cncf.io/).
-- Meetings: We run weekly, public meetings - join one of the upcoming dev meetings from the [Flux calendar](https://fluxcd.io/#calendar).
+- Public meetings: We run weekly meetings - join one of the upcoming dev meetings from the [Flux calendar](https://fluxcd.io/#calendar).
 - Blog: Stay up to date with the latest news on [the Flux blog](https://fluxcd.io/blog/).
 - Mailing list: To be updated on Flux and Flagger progress regularly, please [join the flux-dev mailing list](https://lists.cncf.io/g/cncf-flux-dev).
 

diff --git a/artifacts/flagger/deployment.yaml b/artifacts/flagger/deployment.yaml
@@ -22,7 +22,7 @@ spec:
       serviceAccountName: flagger
       containers:
       - name: flagger
-        image: ghcr.io/fluxcd/flagger:1.24.0
+        image: ghcr.io/fluxcd/flagger:1.24.1
         imagePullPolicy: IfNotPresent
         ports:
         - name: http

diff --git a/charts/flagger/Chart.yaml b/charts/flagger/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: flagger
-version: 1.24.0
-appVersion: 1.24.0
+version: 1.24.1
+appVersion: 1.24.1
 kubeVersion: ">=1.19.0-0"
 engine: gotpl
 description: Flagger is a progressive delivery operator for Kubernetes

diff --git a/charts/flagger/values.yaml b/charts/flagger/values.yaml
@@ -2,7 +2,7 @@
 
 image:
   repository: ghcr.io/fluxcd/flagger
-  tag: 1.24.0
+  tag: 1.24.1
   pullPolicy: IfNotPresent
   pullSecret:
 

diff --git a/kustomize/base/flagger/kustomization.yaml b/kustomize/base/flagger/kustomization.yaml
@@ -9,4 +9,4 @@ resources:
 images:
   - name: ghcr.io/fluxcd/flagger
     newName: ghcr.io/fluxcd/flagger
-    newTag: 1.24.0
+    newTag: 1.24.1
diff --git a/pkg/router/gloo.go b/pkg/router/gloo.go
@@ -170,9 +170,8 @@ func (gr *GlooRouter) GetRoutes(canary *flaggerv1.Canary) (
 	mirrored bool,
 	err error,
 ) {
-	apexName := canary.Spec.TargetRef.Name
-	primaryName := fmt.Sprintf("%s-%s-primaryupstream-%v", canary.Namespace, canary.Spec.TargetRef.Name, canary.Spec.Service.Port)
-
+	apexName, _, _ := canary.GetServiceNames()
+	primaryUpstreamName := fmt.Sprintf("%s-%s-primaryupstream-%v", canary.Namespace, apexName, canary.Spec.Service.Port)
 	routeTable, err := gr.glooClient.GatewayV1().RouteTables(canary.Namespace).Get(context.TODO(), apexName, metav1.GetOptions{})
 	if err != nil {
 		err = fmt.Errorf("RouteTable %s.%s get query error: %w", apexName, canary.Namespace, err)
@@ -185,7 +184,7 @@ func (gr *GlooRouter) GetRoutes(canary *flaggerv1.Canary) (
 	}
 
 	for _, dst := range routeTable.Spec.Routes[0].Action.Destination.Destinations {
-		if dst.Destination.Upstream.Name == primaryName {
+		if dst.Destination.Upstream.Name == primaryUpstreamName {
 			primaryWeight = int(dst.Weight)
 			canaryWeight = 100 - primaryWeight
 			return

diff --git a/pkg/version/version.go b/pkg/version/version.go
@@ -16,5 +16,5 @@ limitations under the License.
 
 package version
 
-var VERSION = "1.24.0"
+var VERSION = "1.24.1"
 var REVISION = "unknown"
diff --git a/test/gloo/install.sh b/test/gloo/install.sh
@@ -2,7 +2,7 @@
 
 set -o errexit
 
-GLOO_VER="1.11.13"
+GLOO_VER="1.12.31"
 REPO_ROOT=$(git rev-parse --show-toplevel)
 
 mkdir -p ${REPO_ROOT}/bin
@@ -15,7 +15,6 @@ helm upgrade -i gloo gloo/gloo --version ${GLOO_VER} \
 --set discovery.enabled=false
 
 kubectl -n gloo-system rollout status deployment/gloo
-kubectl -n gloo-system rollout status deployment/gateway
 kubectl -n gloo-system get all
 
 echo '>>> Installing Flagger'