Rebase latest version

kubernetes-sigs · Sep 1, 2022 · 3a0b793 · 3a0b793
1 parent 760a881
commit 3a0b793
Show file tree

Hide file tree

Showing 3 changed files with 489 additions and 287 deletions.
diff --git a/examples/applyconfig/api/v1/applytest.kubebuilder.io_foos.yaml b/examples/applyconfig/api/v1/applytest.kubebuilder.io_foos.yaml
@@ -1,10 +1,10 @@
 
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.9.0
   creationTimestamp: null
   name: foos.applytest.kubebuilder.io
 spec:
@@ -15,34 +15,33 @@ spec:
     plural: foos
     singular: foo
   scope: Namespaced
-  validation:
-    openAPIV3Schema:
-      properties:
-        apiVersion:
-          description: 'APIVersion defines the versioned schema of this representation
-            of an object. Servers should convert recognized schemas to the latest
-            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-          type: string
-        kind:
-          description: 'Kind is a string value representing the REST resource this
-            object represents. Servers may infer this from the endpoint the client
-            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-          type: string
-        metadata:
-          type: object
-        nonNullableField:
-          type: string
-        nullableField:
-          type: string
-      required:
-      - metadata
-      - nonNullableField
-      type: object
-  version: v1
   versions:
   - name: v1
     served: true
     storage: true
+    schema:
+      openAPIV3Schema:
+        type: object
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+                of an object. Servers should convert recognized schemas to the latest
+                internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+                object represents. Servers may infer this from the endpoint the client
+                submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          nonNullableField:
+            type: string
+          nullableField:
+            type: string
+        required:
+        - nonNullableField
+
 status:
   acceptedNames:
     kind: ""

diff --git a/examples/applyconfig/go.mod b/examples/applyconfig/go.mod
@@ -3,8 +3,8 @@ module sigs.k8s.io/controller-runtime/examples/applyconfig
 go 1.15
 
 require (
-	k8s.io/apimachinery v0.21.0
-	k8s.io/client-go v0.21.0
+	k8s.io/apimachinery v0.25.0
+	k8s.io/client-go v0.25.0
 	sigs.k8s.io/controller-runtime v0.8.1
 )