Skip to content

e2e: seed stale func v1.22.2 so knative, raw, and keda share one path #216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gauron99 merged 1 commit into from
Aug 25, 2026
+49 −52
Merged

e2e: seed stale func v1.22.2 so knative, raw, and keda share one path #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions test/e2e/e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package e2e

import (
"fmt"
"os"
"os/exec"

"github.com/functions-dev/func-operator/test/utils"
Expand All @@ -30,6 +31,26 @@ const namespace = "func-operator-system"
// serviceAccountName created for the project
const serviceAccountName = "func-operator-controller-manager"

func deployerIsKedaOrRaw() bool {
d := os.Getenv("DEFAULT_DEPLOYER")
return d == "keda" || d == "raw"
}

// Newest knative/func that still ships go/http middleware func-go v0.21.3
// and has knative, raw, and keda deployers. Current CLI (1.23+) ships
// v0.22.0, so a seed with this version makes the operator redeploy.
const staleFuncCLI = "v1.22.2"
const staleMiddlewareVersion = "v0.21.3"

// workloadKind is the cluster object that holds the function pod template.
// keda/raw use a Deployment; knative uses a Service (ksvc).
func workloadKind() string {
if deployerIsKedaOrRaw() {
return "deploy"
}
return "ksvc"
}

// logFailedTestDetails logs function resource and controller logs on test failure
func logFailedTestDetails(functionName, functionNamespace string) {
specReport := CurrentSpecReport()
Expand Down
38 changes: 15 additions & 23 deletions test/e2e/func_deploy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,24 +752,18 @@ var _ = Describe("Operator", func() {
// --image-pull-secret to the func CLI during a redeploy, which causes the
// func CLI to set imagePullSecrets on the function's pod spec.
//
// It uses a dummy dockerconfigjson secret and the unauthenticated kind-registry
// because the kind-registry's built-in htpasswd auth is all-or-nothing (no
// per-repository scoping), so enabling auth would break all other tests. The
// unit tests in function_controller_test.go verify the --image-pull-secret flag
// is passed; this test confirms the Knative Service's pod template actually
// receives the imagePullSecrets after a real redeploy.
// It uses a dummy dockerconfigjson secret. Kind uses an unauthenticated
// registry (htpasswd is all-or-nothing, so enabling auth would break
// other tests). Unit tests in function_controller_test.go verify the
// flag; this test confirms the workload pod template receives
// imagePullSecrets after a real redeploy (KService for knative,
// Deployment for keda/raw).
Context("with a registry auth secret", func() {
var repoURL string
var repoDir string
var functionName, functionNamespace string

BeforeEach(func() {
if os.Getenv("DEFAULT_DEPLOYER") == "keda" ||
os.Getenv("DEFAULT_DEPLOYER") == "raw" {
Skip("Skipping registry auth test for Keda & raw deployer, " +
"as test inspect KService directly")
}

var err error

username, password, _, cleanup, err := repoProvider.CreateRandomUser()
Expand All @@ -784,19 +778,17 @@ var _ = Describe("Operator", func() {
Expect(err).NotTo(HaveOccurred())
utils.DeferCleanupOnSuccess(cleanupNamespaces, functionNamespace)

oldFuncVersion := "v1.20.2"
// Seed with staleFuncCLI so middleware is outdated and the operator
// actually runs deploy() (the path that passes --image-pull-secret).
repoDir, err = utils.InitializeRepoWithFunction(
repoURL,
username,
password,
"go",
utils.WithCliVersion(oldFuncVersion))
repoURL, username, password, "go",
utils.WithCliVersion(staleFuncCLI))
Expect(err).NotTo(HaveOccurred())
utils.DeferCleanupOnSuccess(os.RemoveAll, repoDir)

out, err := utils.RunFuncDeploy(repoDir,
utils.WithNamespace(functionNamespace),
utils.WithDeployCliVersion(oldFuncVersion))
utils.WithDeployCliVersion(staleFuncCLI))
Expect(err).NotTo(HaveOccurred())
_, _ = fmt.Fprint(GinkgoWriter, out)

Expand All @@ -812,7 +804,7 @@ var _ = Describe("Operator", func() {
logFailedTestDetails(functionName, functionNamespace)
})

It("should set imagePullSecrets on the Knative Service", func() {
It("should set imagePullSecrets on the function workload", func() {
funcMetadata, err := funcfn.NewFunction(repoDir)
Expect(err).NotTo(HaveOccurred())
deployedFunctionName := funcMetadata.Name
Expand Down Expand Up @@ -860,14 +852,14 @@ var _ = Describe("Operator", func() {

Eventually(functionBecomesReady(functionName, functionNamespace)).Should(Succeed())

// Verify the Knative Service has imagePullSecrets set on its pod template.
// Verify the workload pod template has imagePullSecrets.
Eventually(func(g Gomega) {
cmd := exec.Command("kubectl", "get", "ksvc", deployedFunctionName,
cmd := exec.Command("kubectl", "get", workloadKind(), deployedFunctionName,
"-n", functionNamespace,
"-o", "jsonpath={.spec.template.spec.imagePullSecrets}")
out, err := utils.Run(cmd)
g.Expect(err).NotTo(HaveOccurred())
g.Expect(out).NotTo(BeEmpty(), "imagePullSecrets not set on Knative Service %s", deployedFunctionName)
g.Expect(out).NotTo(BeEmpty(), "imagePullSecrets not set on %s %s", workloadKind(), deployedFunctionName)

var pullSecrets []v1.LocalObjectReference
g.Expect(json.Unmarshal([]byte(out), &pullSecrets)).To(Succeed())
Expand Down
42 changes: 13 additions & 29 deletions test/e2e/func_middleware_update_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,6 @@ var _ = Describe("Middleware Update", func() {
var functionName, functionNamespace string

BeforeEach(func() {
if os.Getenv("DEFAULT_DEPLOYER") == "keda" || os.Getenv("DEFAULT_DEPLOYER") == "raw" {
Skip("Skipping middleware test for Keda & raw deployer, " +
"as those are not supported on used CLI version (1.20.x) of this tests")
}

var err error

// Create repository provider resources with automatic cleanup
Expand All @@ -65,22 +60,20 @@ var _ = Describe("Middleware Update", func() {
Expect(err).NotTo(HaveOccurred())
utils.DeferCleanupOnSuccess(cleanupNamespaces, functionNamespace)

// Initialize repository with function code using OLD func CLI version
// v1.20.2 has no middleware-version label and uses instance-compatible templates
oldFuncVersion := "v1.20.2"
// Seed with staleFuncCLI (func-go v0.21.3, knative/raw/keda).
// Operator current CLI is 1.23+ (func-go v0.22.0) so it must redeploy.
repoDir, err = utils.InitializeRepoWithFunction(
repoURL,
username,
password,
"go",
utils.WithCliVersion(oldFuncVersion))
utils.WithCliVersion(staleFuncCLI))
Expect(err).NotTo(HaveOccurred())
utils.DeferCleanupOnSuccess(os.RemoveAll, repoDir)

// Deploy function using the same OLD func CLI version
out, err := utils.RunFuncDeploy(repoDir,
utils.WithNamespace(functionNamespace),
utils.WithDeployCliVersion(oldFuncVersion))
utils.WithDeployCliVersion(staleFuncCLI))
Expect(err).NotTo(HaveOccurred())
_, _ = fmt.Fprint(GinkgoWriter, out)

Expand Down Expand Up @@ -120,7 +113,7 @@ var _ = Describe("Middleware Update", func() {
// We use skopeo with localhost:5001 (port-forward to the registry) to
// directly inspect the OCI image labels and verify the middleware was updated.

// Get initial image digest from func describe (deployed with v1.20.2)
// Get initial image digest from func describe (seeded with staleFuncCLI)
out, err := utils.RunFunc("describe", deployedFunctionName, "-n", functionNamespace, "-o", "yaml")
Expect(err).NotTo(HaveOccurred())

Expand All @@ -130,9 +123,9 @@ var _ = Describe("Middleware Update", func() {

initialImage := initialInstance.Image
Expect(initialImage).NotTo(BeEmpty(), "Initial image should be available from func describe")
_, _ = fmt.Fprintf(GinkgoWriter, "Initial image (deployed with v1.20.2): %s\n", initialImage)
_, _ = fmt.Fprintf(GinkgoWriter, "Initial image (deployed with %s): %s\n", staleFuncCLI, initialImage)

// Verify initial image has no middleware-version label (v1.20.2 doesn't set it)
// Verify initial image is labeled with stale middleware (func-go v0.21.3)
initialImageLocal := strings.Replace(initialImage, "kind-registry:5000", "localhost:5001", 1)
// Remove tag if both tag and digest are present (skopeo doesn't support this format)
if strings.Contains(initialImageLocal, "@") {
Expand Down Expand Up @@ -161,8 +154,9 @@ var _ = Describe("Middleware Update", func() {
Expect(err).NotTo(HaveOccurred())

initialMiddlewareVersion := initialImageLabels.Labels[funcfn.MiddlewareVersionLabelKey]
_, _ = fmt.Fprintf(GinkgoWriter, "Initial middleware-version label: '%s' (expected empty for v1.20.2)\n",
initialMiddlewareVersion)
_, _ = fmt.Fprintf(GinkgoWriter, "Initial middleware-version label: '%s' (expected %s)\n",
initialMiddlewareVersion, staleMiddlewareVersion)
Expect(initialMiddlewareVersion).To(Equal(staleMiddlewareVersion))

// Create a Function resource
fn := &functionsdevv1alpha1.Function{
Expand Down Expand Up @@ -233,8 +227,8 @@ var _ = Describe("Middleware Update", func() {
updatedMiddlewareVersion := updatedImageLabels.Labels[funcfn.MiddlewareVersionLabelKey]
_, _ = fmt.Fprintf(GinkgoWriter, "Updated middleware-version label: '%s'\n", updatedMiddlewareVersion)

// The operator should have set a middleware version
Expect(updatedMiddlewareVersion).NotTo(BeEmpty(), "Operator should have deployed with middleware-version label set")
Expect(updatedMiddlewareVersion).NotTo(Equal(initialMiddlewareVersion), "Operator should have bumped middleware")

Eventually(functionMiddlewareUpToDate(functionName, functionNamespace), 2*time.Minute).Should(Succeed())
})
Expand All @@ -253,11 +247,6 @@ var _ = Describe("Middleware Update", func() {
var originalConfigMapData map[string]string

BeforeEach(func() {
if os.Getenv("DEFAULT_DEPLOYER") == "keda" || os.Getenv("DEFAULT_DEPLOYER") == "raw" {
Skip("Skipping middleware test for Keda & raw deployer, " +
"as those are not supported on used CLI version (1.20.x) of this tests")
}

var err error

// Save original ConfigMap data to restore later
Expand Down Expand Up @@ -300,22 +289,18 @@ var _ = Describe("Middleware Update", func() {
Expect(err).NotTo(HaveOccurred())
utils.DeferCleanupOnSuccess(cleanupNamespaces, functionNamespace)

// Initialize repository with function code using OLD func CLI version
// to ensure middleware will be outdated
oldFuncVersion := "v1.20.2"
repoDir, err = utils.InitializeRepoWithFunction(
repoURL,
username,
password,
"go",
utils.WithCliVersion(oldFuncVersion))
utils.WithCliVersion(staleFuncCLI))
Expect(err).NotTo(HaveOccurred())
utils.DeferCleanupOnSuccess(os.RemoveAll, repoDir)

// Deploy function using the same OLD func CLI version
out, err := utils.RunFuncDeploy(repoDir,
utils.WithNamespace(functionNamespace),
utils.WithDeployCliVersion(oldFuncVersion))
utils.WithDeployCliVersion(staleFuncCLI))
Expect(err).NotTo(HaveOccurred())
_, _ = fmt.Fprint(GinkgoWriter, out)

Expand Down Expand Up @@ -433,7 +418,6 @@ var _ = Describe("Middleware Update", func() {
}, fn)
g.Expect(err).NotTo(HaveOccurred())

// The image should have changed (middleware was updated)
g.Expect(fn.Status.Deployment.Image).NotTo(BeEmpty())
g.Expect(fn.Status.Deployment.Image).NotTo(Equal(imageBefore),
"Image should have changed after middleware update")
Expand Down
Loading