mirror of
https://github.com/fluxcd/flagger.git
synced 2026-04-15 06:57:34 +00:00
+2
-2
@@ -33,7 +33,7 @@ import (
|
||||
clientset "github.com/fluxcd/flagger/pkg/client/clientset/versioned"
|
||||
)
|
||||
|
||||
// GlooRouter is managing Istio virtual services
|
||||
// GlooRouter is managing Gloo route tables
|
||||
type GlooRouter struct {
|
||||
kubeClient kubernetes.Interface
|
||||
glooClient clientset.Interface
|
||||
@@ -42,7 +42,7 @@ type GlooRouter struct {
|
||||
upstreamDiscoveryNs string
|
||||
}
|
||||
|
||||
// Reconcile creates or updates the Istio virtual service
|
||||
// Reconcile creates or updates the Gloo Edge route table
|
||||
func (gr *GlooRouter) Reconcile(canary *flaggerv1.Canary) error {
|
||||
apexName, _, _ := canary.GetServiceNames()
|
||||
canaryName := fmt.Sprintf("%s-%s-canary-%v", canary.Namespace, apexName, canary.Spec.Service.Port)
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
set -o errexit
|
||||
|
||||
GLOO_VER="1.3.28"
|
||||
GLOO_VER="1.5.13"
|
||||
REPO_ROOT=$(git rev-parse --show-toplevel)
|
||||
|
||||
mkdir -p ${REPO_ROOT}/bin
|
||||
|
||||
@@ -1,11 +1,28 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# This script runs e2e tests for Canary initialization, analysis and promotion
|
||||
<<<<<<< HEAD:test/gloo/test-canary.sh
|
||||
=======
|
||||
# Prerequisites: Kubernetes Kind, Helm and Gloo Edge ingress controller
|
||||
>>>>>>> Initial commit:test/e2e-gloo-tests.sh
|
||||
|
||||
set -o errexit
|
||||
|
||||
REPO_ROOT=$(git rev-parse --show-toplevel)
|
||||
|
||||
<<<<<<< HEAD:test/gloo/test-canary.sh
|
||||
=======
|
||||
echo '>>> Creating test namespace'
|
||||
kubectl create namespace test
|
||||
|
||||
echo '>>> Installing load tester'
|
||||
kubectl apply -k ${REPO_ROOT}/kustomize/tester
|
||||
kubectl -n test rollout status deployment/flagger-loadtester
|
||||
|
||||
echo '>>> Initializing canary'
|
||||
kubectl apply -f ${REPO_ROOT}/test/e2e-workload.yaml
|
||||
|
||||
>>>>>>> Initial commit:test/e2e-gloo-tests.sh
|
||||
cat <<EOF | kubectl apply -f -
|
||||
apiVersion: gateway.solo.io/v1
|
||||
kind: VirtualService
|
||||
|
||||
Reference in New Issue
Block a user