Merge pull request #541 from chrisThePattyEater/main

Replace metadata prefetch prefix with dash instead of slash to keep u…

Author: chrisThePattyEater

pkg/webhook/injection.go

@@ -29,7 +29,7 @@ import (
 
 var sidecarPrefixMap = map[string]string{
 	GcsFuseSidecarName:          "gke-gcsfuse/",
-	MetadataPrefetchSidecarName: "gke-gcsfuse/metadata-prefetch/",
+	MetadataPrefetchSidecarName: "gke-gcsfuse/metadata-prefetch-",
 }
 
 // used to guarantee containers start in the correct sequence based on inter-container dependencies.

pkg/webhook/injection_test.go

@@ -1030,14 +1030,14 @@ func TestInjectMetadataPrefetchSidecar(t *testing.T) {
 			expectedPod: &corev1.Pod{
 				ObjectMeta: metav1.ObjectMeta{
 					Annotations: map[string]string{
-						"gke-gcsfuse/metadata-prefetch/container-image":           "fake-image",
-						"gke-gcsfuse/metadata-prefetch/cpu-limit":                 "250m",
-						"gke-gcsfuse/metadata-prefetch/cpu-request":               "250m",
-						"gke-gcsfuse/metadata-prefetch/ephemeral-storage-limit":   "5Gi",
-						"gke-gcsfuse/metadata-prefetch/ephemeral-storage-request": "5Gi",
-						"gke-gcsfuse/metadata-prefetch/image-pull-policy":         "Always",
-						"gke-gcsfuse/metadata-prefetch/memory-limit":              "20Mi",
-						"gke-gcsfuse/metadata-prefetch/memory-request":            "20Mi",
+						"gke-gcsfuse/metadata-prefetch-container-image":           "fake-image",
+						"gke-gcsfuse/metadata-prefetch-cpu-limit":                 "250m",
+						"gke-gcsfuse/metadata-prefetch-cpu-request":               "250m",
+						"gke-gcsfuse/metadata-prefetch-ephemeral-storage-limit":   "5Gi",
+						"gke-gcsfuse/metadata-prefetch-ephemeral-storage-request": "5Gi",
+						"gke-gcsfuse/metadata-prefetch-image-pull-policy":         "Always",
+						"gke-gcsfuse/metadata-prefetch-memory-limit":              "20Mi",
+						"gke-gcsfuse/metadata-prefetch-memory-request":            "20Mi",
 					},
 				},
 				Spec: corev1.PodSpec{
@@ -1147,13 +1147,13 @@ func TestInjectMetadataPrefetchSidecar(t *testing.T) {
 			expectedPod: &corev1.Pod{
 				ObjectMeta: metav1.ObjectMeta{
 					Annotations: map[string]string{
-						"gke-gcsfuse/metadata-prefetch/container-image":           "fake-image",
-						"gke-gcsfuse/metadata-prefetch/cpu-limit":                 "250m",
-						"gke-gcsfuse/metadata-prefetch/cpu-request":               "250m",
-						"gke-gcsfuse/metadata-prefetch/ephemeral-storage-limit":   "5Gi",
-						"gke-gcsfuse/metadata-prefetch/ephemeral-storage-request": "5Gi",
-						"gke-gcsfuse/metadata-prefetch/image-pull-policy":         "Always",
-						"gke-gcsfuse/metadata-prefetch/memory-request":            "20Mi",
+						"gke-gcsfuse/metadata-prefetch-container-image":           "fake-image",
+						"gke-gcsfuse/metadata-prefetch-cpu-limit":                 "250m",
+						"gke-gcsfuse/metadata-prefetch-cpu-request":               "250m",
+						"gke-gcsfuse/metadata-prefetch-ephemeral-storage-limit":   "5Gi",
+						"gke-gcsfuse/metadata-prefetch-ephemeral-storage-request": "5Gi",
+						"gke-gcsfuse/metadata-prefetch-image-pull-policy":         "Always",
+						"gke-gcsfuse/metadata-prefetch-memory-request":            "20Mi",
 					},
 				},
 				Spec: corev1.PodSpec{
@@ -1280,14 +1280,14 @@ func TestInjectMetadataPrefetchSidecar(t *testing.T) {
 			expectedPod: &corev1.Pod{
 				ObjectMeta: metav1.ObjectMeta{
 					Annotations: map[string]string{
-						"gke-gcsfuse/metadata-prefetch/container-image":           "fake-image",
-						"gke-gcsfuse/metadata-prefetch/cpu-limit":                 "50m",
-						"gke-gcsfuse/metadata-prefetch/cpu-request":               "10m",
-						"gke-gcsfuse/metadata-prefetch/ephemeral-storage-limit":   "10Mi",
-						"gke-gcsfuse/metadata-prefetch/ephemeral-storage-request": "10Mi",
-						"gke-gcsfuse/metadata-prefetch/image-pull-policy":         "Always",
-						"gke-gcsfuse/metadata-prefetch/memory-limit":              "10Mi",
-						"gke-gcsfuse/metadata-prefetch/memory-request":            "10Mi",
+						"gke-gcsfuse/metadata-prefetch-container-image":           "fake-image",
+						"gke-gcsfuse/metadata-prefetch-cpu-limit":                 "50m",
+						"gke-gcsfuse/metadata-prefetch-cpu-request":               "10m",
+						"gke-gcsfuse/metadata-prefetch-ephemeral-storage-limit":   "10Mi",
+						"gke-gcsfuse/metadata-prefetch-ephemeral-storage-request": "10Mi",
+						"gke-gcsfuse/metadata-prefetch-image-pull-policy":         "Always",
+						"gke-gcsfuse/metadata-prefetch-memory-limit":              "10Mi",
+						"gke-gcsfuse/metadata-prefetch-memory-request":            "10Mi",
 					},
 				},
 				Spec: corev1.PodSpec{

pkg/webhook/mutatingwebhook.go

@@ -42,8 +42,8 @@ const (
 	memoryRequestAnnotation                 = "gke-gcsfuse/memory-request"
 	ephemeralStorageLimitAnnotation         = "gke-gcsfuse/ephemeral-storage-limit"
 	ephemeralStorageRequestAnnotation       = "gke-gcsfuse/ephemeral-storage-request"
-	metadataPrefetchMemoryLimitAnnotation   = "gke-gcsfuse/metadata-prefetch/memory-limit"
-	metadataPrefetchMemoryRequestAnnotation = "gke-gcsfuse/metadata-prefetch/memory-request"
+	metadataPrefetchMemoryLimitAnnotation   = "gke-gcsfuse/metadata-prefetch-memory-limit"
+	metadataPrefetchMemoryRequestAnnotation = "gke-gcsfuse/metadata-prefetch-memory-request"
 )
 
 type SidecarInjector struct {