Merge branch 'main' into adjust-docs-for-buildless

Author: MichalKalke

components/buildless-serverless/internal/controller/resources/deployment.go

@@ -21,7 +21,6 @@ const (
 	istioConfigLabelKey                      = "proxy.istio.io/config"
 	istioEnableHoldUntilProxyStartLabelValue = "{ \"holdApplicationUntilProxyStarts\": true }"
 	istioNativeSidecarLabelKey               = "sidecar.istio.io/nativeSidecar"
-	istioInjectSidecarLabelKey               = "sidecar.istio.io/inject"
 )
 
 type Deployment struct {
@@ -110,13 +109,11 @@ func (d *Deployment) currentAnnotationsWithoutPreviousFunctionAnnotations() map[
 	return result
 }
 
+// allow istio to inject native sidecar (istio-proxy as init container)
+// this is required for init container of git sourced functions to fetch source from git repository
 func (d *Deployment) annotationsRequiredByIstio() map[string]string {
 	result := make(map[string]string)
-
-	if d.function.HasGitSources() && d.function.HasLabel(istioInjectSidecarLabelKey, "true") {
-		result[istioNativeSidecarLabelKey] = "true"
-	}
-
+	result[istioNativeSidecarLabelKey] = "true"
 	return result
 }
 

components/buildless-serverless/internal/controller/resources/deployment_test.go

@@ -137,26 +137,16 @@ func TestDeployment_construct(t *testing.T) {
 
 		require.NotNil(t, r)
 		require.Equal(t, map[string]string{
-			"proxy.istio.io/config": "{ \"holdApplicationUntilProxyStarts\": true }",
-			"leavitt":               "hopeful",
-			"pike":                  "tender",
-			"thompson":              "exciting",
+			"proxy.istio.io/config":          "{ \"holdApplicationUntilProxyStarts\": true }",
+			"leavitt":                        "hopeful",
+			"pike":                           "tender",
+			"thompson":                       "exciting",
+			"sidecar.istio.io/nativeSidecar": "true",
 		}, r.Spec.Template.ObjectMeta.Annotations)
 	})
-	t.Run("enable native sidecar when istio is enabled and function has git repo", func(t *testing.T) {
+	t.Run("enable native sidecar", func(t *testing.T) {
 		d := minimalDeployment()
 
-		d.function.Spec.Source = serverlessv1alpha2.Source{
-			GitRepository: &serverlessv1alpha2.GitRepositorySource{
-				URL: "wonderful-germain",
-				Repository: serverlessv1alpha2.Repository{
-					BaseDir:   "recursing-mcnulty",
-					Reference: "epic-mendel"}}}
-
-		d.function.Spec.Labels = map[string]string{
-			"sidecar.istio.io/inject": "true",
-		}
-
 		r := d.construct()
 
 		require.NotNil(t, r)

external-images.yaml

@@ -1,6 +1,6 @@
 images:
-  - source: "alpine@sha256:8a1f59ffb675680d47db6337b49d22281a139e9d709335b492be023728e11715"
-    tag: "3.22.0"
+  - source: "alpine@sha256:4bcff63911fcb4448bd4fdacec207030997caf25e9bea4045fa6c8c44de311d1"
+    tag: "3.22.1"
   - source: "python@sha256:c610e4a94a0e8b888b4b225bfc0e6b59dee607b1e61fb63ff3926083ff617216"
     tag: "3.12.11-alpine3.22"
   - source: "golang@sha256:ddf52008bce1be455fe2b22d780b6693259aaf97b16383b6372f4b22dd33ad66"