1.17/fix/persistproxyspec

changelog/v1.17.8/persist-proxy-upgrade-fix.yaml

@@ -0,0 +1,12 @@
+changelog:
+  - type: FIX
+    issueLink: https://github.com/solo-io/gloo/issues/9968
+    resolvesIssue: false
+    description: >-
+      Fixes an issue on upgrades to 1.17+ where persistproxyspec was set to true.
+      Persist proxy spec is configured in helm via gateway.persistProxySpec or in ee gloo.gateway.persistProxySpec
+  - type: NON_USER_FACING
+    description:
+      Updates upgrade test with some of the extra functionality previously only in the enterprise test steps.
+      This is used to validate the main issue for persistproxy spec.
+      The changes do not adhere to our current best practices on writing tests but follow the prior art in enterprise.

projects/clusteringress/pkg/translator/translator_syncer.go

@@ -51,8 +51,10 @@ var (
 	//
 	// This is only required for backwards compatibility.
 	// Once users have upgraded to a version with new labels, we can delete this code and read/write the same labels.
+	// gloo-knative-translator removed in 1.17
+	// knative removed in 1.12
 	proxyLabelSelectorOptions = clients.ListOpts{
-		ExpressionSelector: glooutils.GetTranslatorSelectorExpression(glooutils.KnativeProxyValue, "knative"),
+		ExpressionSelector: glooutils.GetTranslatorSelectorExpression(glooutils.KnativeProxyValue, "gloo-knative-translator", "knative"),
 	}
 )
 

projects/gateway/pkg/syncer/translator_syncer.go

@@ -60,9 +60,11 @@ var (
 	//
 	// This is only required for backwards compatibility.
 	// Once users have upgraded to a version with new labels, we can delete this code and read/write the same labels.
+	// gloo-gateway-translator removed in 1.17
+	// gateway removed in 1.12
 	proxyLabelSelectorOptions = clients.ListOpts{
 		Selector:           proxyLabelsToWrite,
-		ExpressionSelector: glooutils.GetTranslatorSelectorExpression(glooutils.GlooEdgeProxyValue, "gateway"),
+		ExpressionSelector: glooutils.GetTranslatorSelectorExpression(glooutils.GlooEdgeProxyValue, "gloo-gateway-translator", "gateway"),
 	}
 )
 

projects/gloo/pkg/utils/translators.go

@@ -7,6 +7,9 @@ import (
 	"github.com/solo-io/solo-kit/pkg/api/v1/resources/core"
 )
 
+// Danger any label changes here likely requires more than a drop in replacement string.
+// Any selectors likely still have to take the union of the old string name in order to facilitate orderly upgrades.
+
 const (
 	// ProxyTypeKey is the label key applied to Proxies generated by the Gloo Edge translator
 	ProxyTypeKey = "created_by"

projects/ingress/pkg/translator/translator_syncer.go

@@ -49,8 +49,10 @@ var (
 	//
 	// This is only required for backwards compatibility.
 	// Once users have upgraded to a version with new labels, we can delete this code and read/write the same labels.
+	// gloo-ingress-translator removed in 1.17
+	// ingress removed in 1.12
 	proxyLabelSelectorOptions = clients.ListOpts{
-		ExpressionSelector: glooutils.GetTranslatorSelectorExpression(glooutils.IngressProxyValue, "ingress"),
+		ExpressionSelector: glooutils.GetTranslatorSelectorExpression(glooutils.IngressProxyValue, "gloo-ingress-translator", "ingress"),
 	}
 )
 

test/kube2e/upgrade/testdata/petstorebase/petstore_deployment.yaml

@@ -0,0 +1,23 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: petstore
+  name: petstore
+  namespace: gloo-system
+spec:
+  selector:
+    matchLabels:
+      app: petstore
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: petstore
+    spec:
+      containers:
+        - image: soloio/petstore-example:latest
+          name: petstore
+          ports:
+            - containerPort: 8080
+              name: http

test/kube2e/upgrade/testdata/petstorebase/petstore_svc.yaml

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: petstore
+  namespace: gloo-system
+  labels:
+    service: petstore
+spec:
+  ports:
+    - name: http
+      port: 8080
+      protocol: TCP
+  selector:
+    app: petstore

test/kube2e/upgrade/testdata/petstorebase/petstore_ups.yaml

@@ -0,0 +1,14 @@
+apiVersion: gloo.solo.io/v1
+kind: Upstream
+metadata:
+  labels:
+    app: petstore
+    discovered_by: kubernetesplugin
+  name: gloo-system-petstore-8080
+  namespace: gloo-system
+spec:
+  discoveryMetadata: {}
+  kube:
+    serviceName: petstore
+    serviceNamespace: gloo-system
+    servicePort: 8080

test/kube2e/upgrade/testdata/petstorevs/vs_postupgrade.yaml

@@ -0,0 +1,29 @@
+apiVersion: gateway.solo.io/v1
+kind: VirtualService
+metadata:
+  name: petstore
+  namespace: gloo-system
+  ownerReferences: []
+spec:
+  virtualHost:
+    domains:
+      - 'petstore'
+    routes:
+      - matchers:
+          - exact: /some-pets
+        options:
+          prefixRewrite: /api/pets
+        routeAction:
+          single:
+            upstream:
+              name: gloo-system-petstore-8080
+              namespace: gloo-system
+      - matchers:
+          - exact: /a-pet
+        options:
+          prefixRewrite: /api/pets
+        routeAction:
+          single:
+            upstream:
+              name: gloo-system-petstore-8080
+              namespace: gloo-system

test/kube2e/upgrade/testdata/petstorevs/vs_preupgrade.yaml

@@ -0,0 +1,29 @@
+apiVersion: gateway.solo.io/v1
+kind: VirtualService
+metadata:
+  name: petstore
+  namespace: gloo-system
+  ownerReferences: []
+spec:
+  virtualHost:
+    domains:
+      - 'petstore'
+    routes:
+      - matchers:
+          - exact: /all-pets
+        options:
+          prefixRewrite: /api/pets
+        routeAction:
+          single:
+            upstream:
+              name: gloo-system-petstore-8080
+              namespace: gloo-system
+      - matchers:
+          - exact: /single-pet
+        options:
+          prefixRewrite: /api/pets
+        routeAction:
+          single:
+            upstream:
+              name: gloo-system-petstore-8080
+              namespace: gloo-system

test/kube2e/upgrade/upgrade_data_validation_test.go

@@ -0,0 +1,44 @@
+package upgrade_test
+
+import (
+	"time"
+
+	"github.com/solo-io/gloo/test/kube2e/helper"
+)
+
+// this package follows the current strategy in enterprise upgrade tests of using curl to test validity of traffic routing.
+// Curl is chosen because it is closest to our end user's experience and is a simple way to test traffic routing.
+// The downside is that this may be less reliable due to string parsing rather than using actual go code to test the traffic routing.
+// TODO(nfuden): Refactor to make sure its not classic api locked but also supports kubernetes gateway api.
+
+var (
+	// petstore is a simple deployment used for most of our docs to show basic traffic patterns
+	petStoreHost = "petstore"
+
+	// gateway is currently aligned with classic gateway deployment strategy
+	gatewayProxyName = "gateway-proxy"
+	gatewayProxyPort = 80
+)
+
+func validatePetstoreTraffic(testHelper *helper.SoloTestHelper, path string) {
+	petString := "[{\"id\":1,\"name\":\"Dog\",\"status\":\"available\"},{\"id\":2,\"name\":\"Cat\",\"status\":\"pending\"}]"
+	CurlAndAssertResponse(testHelper, petStoreHost, path, petString)
+}
+
+// ===================================
+// Traffic Validation Curl Functions
+// ===================================
+
+func CurlAndAssertResponse(testHelper *helper.SoloTestHelper, host string, path string, expectedResponseSubstring string) {
+	testHelper.CurlEventuallyShouldRespond(helper.CurlOpts{
+		Protocol:          "http",
+		Path:              path,
+		Method:            "GET",
+		Host:              host,
+		Service:           gatewayProxyName,
+		Port:              gatewayProxyPort,
+		ConnectionTimeout: 5, // this is important, as the first curl call sometimes hangs indefinitely
+		Verbose:           true,
+		LogResponses:      false,
+	}, expectedResponseSubstring, 1, time.Minute*1)
+}