Add openAPIV3Schema to CRDs

go.mod

@@ -15,7 +15,9 @@ require (
 	k8s.io/apiextensions-apiserver v0.17.0
 	k8s.io/apimachinery v0.17.0
 	k8s.io/client-go v0.17.0
+	k8s.io/code-generator v0.17.0
 	k8s.io/klog v1.0.0
 	k8s.io/kube-aggregator v0.17.0
 	k8s.io/utils v0.0.0-20191114200735-6ca3b61696b6 // indirect
+	sigs.k8s.io/controller-tools v0.2.8
 )

hack/update-codegen.sh

@@ -22,48 +22,33 @@ THIS_REPO="github.com/kubernetes-sigs/kube-storage-version-migrator"
 API_PKG="${THIS_REPO}/pkg/apis/migration/v1alpha1"
 # Absolute path to this repo
 THIS_REPO_ABSOLUTE="$(cd "$(dirname "${BASH_SOURCE}")/.." && pwd -P)"
-WORK_DIR=`mktemp -d`
 
-function cleanup {
-  rm -rf "$WORK_DIR"
-}
-trap cleanup EXIT
+go run ./vendor/sigs.k8s.io/controller-tools/cmd/controller-gen \
+  schemapatch:manifests="${THIS_REPO_ABSOLUTE}/manifests" \
+  paths="${THIS_REPO_ABSOLUTE}/pkg/apis/migration/v1alpha1" \
+  output:dir="${THIS_REPO_ABSOLUTE}/manifests"
 
-# Install code generators
-mkdir -p ${WORK_DIR}/go/src/k8s.io
-pushd ${WORK_DIR}/go/src/k8s.io
-git clone git@github.com:kubernetes/code-generator.git
-popd
-pushd ${WORK_DIR}/go/src/k8s.io/code-generator
-# The version needs to match the one in Gopkg.toml
-git checkout kubernetes-1.15.0-alpha.0
-GOPATH=${WORK_DIR}/go/ go install k8s.io/code-generator/cmd/lister-gen
-GOPATH=${WORK_DIR}/go/ go install k8s.io/code-generator/cmd/informer-gen
-GOPATH=${WORK_DIR}/go/ go install k8s.io/code-generator/cmd/client-gen
-GOPATH=${WORK_DIR}/go/ go install k8s.io/code-generator/cmd/deepcopy-gen
-popd
-
-${WORK_DIR}/go/bin/client-gen \
+go run ./vendor/k8s.io/code-generator/cmd/client-gen \
   --output-package "${THIS_REPO}/pkg/clients" \
   --clientset-name="clientset" \
   --input-base="${THIS_REPO}" \
   --input="pkg/apis/migration/v1alpha1" \
   --go-header-file "${THIS_REPO_ABSOLUTE}/hack/boilerplate/boilerplate.generatego.txt"
 
-${WORK_DIR}/go/bin/lister-gen \
+go run ./vendor/k8s.io/code-generator/cmd/lister-gen \
   --output-package "${THIS_REPO}/pkg/clients/lister" \
   --input-dirs="${API_PKG}" \
   --go-header-file "${THIS_REPO_ABSOLUTE}/hack/boilerplate/boilerplate.generatego.txt"
 
-${WORK_DIR}/go/bin/informer-gen \
+go run ./vendor/k8s.io/code-generator/cmd/informer-gen \
   --output-package "${THIS_REPO}/pkg/clients/informer" \
   --input-dirs="${API_PKG}" \
   --go-header-file "${THIS_REPO_ABSOLUTE}/hack/boilerplate/boilerplate.generatego.txt" \
   --single-directory\
   --versioned-clientset-package "${THIS_REPO}/pkg/clients/clientset" \
   --listers-package "${THIS_REPO}/pkg/clients/lister"
 
-${WORK_DIR}/go/bin/deepcopy-gen \
+go run ./vendor/k8s.io/code-generator/cmd/deepcopy-gen \
   --input-dirs="${API_PKG}" \
   --output-file-base="zz_generated.deepcopy" \
   --go-header-file "${THIS_REPO_ABSOLUTE}/hack/boilerplate/boilerplate.generatego.txt"

manifests/storage_migration_crd.yaml

@@ -0,0 +1,95 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: storageversionmigrations.migration.k8s.io
+spec:
+  group: migration.k8s.io
+  names:
+    kind: StorageVersionMigration
+    listKind: StorageVersionMigrationList
+    plural: storageversionmigrations
+    singular: storageversionmigration
+  scope: Cluster
+  subresources:
+    status: {}
+  version: v1alpha1
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
+  "validation":
+    "openAPIV3Schema":
+      description: StorageVersionMigration represents a migration of stored data to
+        the latest storage version.
+      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
+        spec:
+          description: Specification of the migration.
+          type: object
+          required:
+          - resource
+          properties:
+            continueToken:
+              description: The token used in the list options to get the next chunk
+                of objects to migrate. When the .status.conditions indicates the migration
+                is "Running", users can use this token to check the progress of the
+                migration.
+              type: string
+            resource:
+              description: The resource that is being migrated. The migrator sends
+                requests to the endpoint serving the resource. Immutable.
+              type: object
+              properties:
+                group:
+                  description: The name of the group.
+                  type: string
+                resource:
+                  description: The name of the resource.
+                  type: string
+                version:
+                  description: The name of the version.
+                  type: string
+        status:
+          description: Status of the migration.
+          type: object
+          properties:
+            conditions:
+              description: The latest available observations of the migration's current
+                state.
+              type: array
+              items:
+                description: Describes the state of a migration at a certain point.
+                type: object
+                required:
+                - status
+                - type
+                properties:
+                  lastUpdateTime:
+                    description: The last time this condition was updated.
+                    type: string
+                    format: date-time
+                  message:
+                    description: A human readable message indicating details about
+                      the transition.
+                    type: string
+                  reason:
+                    description: The reason for the condition's last transition.
+                    type: string
+                  status:
+                    description: Status of the condition, one of True, False, Unknown.
+                    type: string
+                  type:
+                    description: Type of the condition.
+                    type: string

manifests/storage_state_crd.yaml

@@ -0,0 +1,79 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: storagestates.migration.k8s.io
+spec:
+  group: migration.k8s.io
+  names:
+    kind: StorageState
+    listKind: StorageStateList
+    plural: storagestates
+    singular: storagestate
+  scope: Cluster
+  subresources:
+    status: {}
+  version: v1alpha1
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
+  "validation":
+    "openAPIV3Schema":
+      description: The state of the storage of a specific resource.
+      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:
+          description: The name must be "<.spec.resource.resouce>.<.spec.resource.group>".
+          type: object
+        spec:
+          description: Specification of the storage state.
+          type: object
+          properties:
+            resource:
+              description: The resource this storageState is about.
+              type: object
+              properties:
+                group:
+                  description: The name of the group.
+                  type: string
+                resource:
+                  description: The name of the resource.
+                  type: string
+        status:
+          description: Status of the storage state.
+          type: object
+          properties:
+            currentStorageVersionHash:
+              description: The hash value of the current storage version, as shown
+                in the discovery document served by the API server. Storage Version
+                is the version to which objects are converted to before persisted.
+              type: string
+            lastHeartbeatTime:
+              description: LastHeartbeatTime is the last time the storage migration
+                triggering controller checks the storage version hash of this resource
+                in the discovery document and updates this field.
+              type: string
+              format: date-time
+            persistedStorageVersionHashes:
+              description: The hash values of storage versions that persisted instances
+                of spec.resource might still be encoded in. "Unknown" is a valid value
+                in the list, and is the default value. It is not safe to upgrade or
+                downgrade to an apiserver binary that does not support all versions
+                listed in this field, or if "Unknown" is listed. Once the storage
+                version migration for this resource has completed, the value of this
+                field is refined to only contain the currentStorageVersionHash. Once
+                the apiserver has changed the storage version, the new storage version
+                is appended to the list.
+              type: array
+              items:
+                type: string