fix(kube): use k8s-compatible yaml for manifest apply/build

Author: acmore

internal/kube/client.go

@@ -17,7 +17,6 @@ import (
 	"time"
 
 	"github.com/acmore/okdev/internal/shellutil"
-	"gopkg.in/yaml.v3"
 	coordinationv1 "k8s.io/api/coordination/v1"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -31,6 +30,7 @@ import (
 	"k8s.io/client-go/tools/portforward"
 	"k8s.io/client-go/tools/remotecommand"
 	"k8s.io/client-go/transport/spdy"
+	"sigs.k8s.io/yaml"
 )
 
 type Client struct {

internal/kube/manifests.go

@@ -4,10 +4,9 @@ import (
 	"fmt"
 
 	"github.com/acmore/okdev/internal/config"
-	"gopkg.in/yaml.v3"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"sigs.k8s.io/yaml"
 )
 
 func BuildPVCManifest(namespace, name, size, storageClass string, labels map[string]string, annotations map[string]string) ([]byte, error) {
@@ -18,52 +17,49 @@ func BuildPVCManifest(namespace, name, size, storageClass string, labels map[str
 	if err != nil {
 		return nil, fmt.Errorf("parse pvc size %q: %w", size, err)
 	}
-	pvc := corev1.PersistentVolumeClaim{
-		TypeMeta: metav1.TypeMeta{
-			APIVersion: "v1",
-			Kind:       "PersistentVolumeClaim",
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name:        name,
-			Namespace:   namespace,
-			Labels:      labels,
-			Annotations: annotations,
-		},
-		Spec: corev1.PersistentVolumeClaimSpec{
-			AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
-			Resources: corev1.VolumeResourceRequirements{
-				Requests: corev1.ResourceList{
-					corev1.ResourceStorage: qty,
-				},
+	pvcSpec := corev1.PersistentVolumeClaimSpec{
+		AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
+		Resources: corev1.VolumeResourceRequirements{
+			Requests: corev1.ResourceList{
+				corev1.ResourceStorage: qty,
 			},
 		},
 	}
 	if storageClass != "" {
-		pvc.Spec.StorageClassName = &storageClass
+		pvcSpec.StorageClassName = &storageClass
 	}
-	b, err := yaml.Marshal(pvc)
+	manifest := map[string]any{
+		"apiVersion": "v1",
+		"kind":       "PersistentVolumeClaim",
+		"metadata": map[string]any{
+			"name":        name,
+			"namespace":   namespace,
+			"labels":      labels,
+			"annotations": annotations,
+		},
+		"spec": pvcSpec,
+	}
+	b, err := yaml.Marshal(manifest)
 	if err != nil {
 		return nil, fmt.Errorf("marshal pvc manifest: %w", err)
 	}
 	return b, nil
 }
 
 func BuildPodManifest(namespace, name string, labels map[string]string, annotations map[string]string, podSpec corev1.PodSpec) ([]byte, error) {
-	pod := corev1.Pod{
-		TypeMeta: metav1.TypeMeta{
-			APIVersion: "v1",
-			Kind:       "Pod",
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name:        name,
-			Namespace:   namespace,
-			Labels:      labels,
-			Annotations: annotations,
+	manifest := map[string]any{
+		"apiVersion": "v1",
+		"kind":       "Pod",
+		"metadata": map[string]any{
+			"name":        name,
+			"namespace":   namespace,
+			"labels":      labels,
+			"annotations": annotations,
 		},
-		Spec: podSpec,
+		"spec": podSpec,
 	}
 
-	b, err := yaml.Marshal(pod)
+	b, err := yaml.Marshal(manifest)
 	if err != nil {
 		return nil, fmt.Errorf("marshal pod manifest: %w", err)
 	}

internal/kube/manifests_test.go

@@ -13,7 +13,7 @@ func TestBuildPVCManifest(t *testing.T) {
 		t.Fatal(err)
 	}
 	s := string(m)
-	if !strings.Contains(s, "PersistentVolumeClaim") || !strings.Contains(s, "ReadWriteOnce") || !strings.Contains(s, "okdev.io/ttl-hours") {
+	if !strings.Contains(s, "kind: PersistentVolumeClaim") || !strings.Contains(s, "apiVersion: v1") || !strings.Contains(s, "ReadWriteOnce") || !strings.Contains(s, "okdev.io/ttl-hours") {
 		t.Fatalf("unexpected manifest: %s", s)
 	}
 }
@@ -27,7 +27,7 @@ func TestBuildPodManifestDefault(t *testing.T) {
 		t.Fatal(err)
 	}
 	s := string(m)
-	if !strings.Contains(s, "kind: Pod") || !strings.Contains(s, "name: dev") {
+	if !strings.Contains(s, "kind: Pod") || !strings.Contains(s, "apiVersion: v1") || !strings.Contains(s, "name: pod1") {
 		t.Fatalf("unexpected pod manifest: %s", s)
 	}
 }