K8S-536 fix registry-creds schema

Author: dfateyev

addons/registry-creds/registry-creds-system.yaml

@@ -5,56 +5,55 @@ metadata:
     control-plane: registry-creds-controller
   name: registry-creds-system
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.2.5
   creationTimestamp: null
   name: clusterpullsecrets.ops.alexellis.io
 spec:
-  additionalPrinterColumns:
-  - JSONPath: .spec.secretRef.name
-    name: SecretName
-    type: string
-  - JSONPath: .spec.secretRef.namespace
-    name: SecretNamespace
-    type: string
   group: ops.alexellis.io
   names:
     kind: ClusterPullSecret
     listKind: ClusterPullSecretList
     plural: clusterpullsecrets
     singular: clusterpullsecret
   scope: Cluster
-  subresources: {}
-  validation:
-    openAPIV3Schema:
-      description: ClusterPullSecret is the Schema for the clusterpullsecrets API
-      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: ClusterPullSecretSpec defines the desired state of ClusterPullSecret
-          properties:
-            secretRef:
-              type: object
-          type: object
-        status:
-          description: ClusterPullSecretStatus defines the observed state of ClusterPullSecret
-          type: object
-      type: object
-  version: v1
   versions:
   - name: v1
     served: true
     storage: true
+    subresources: {}
+    additionalPrinterColumns:
+    - jsonPath: .spec.secretRef.name
+      name: SecretName
+      type: string
+    - jsonPath: .spec.secretRef.namespace
+      name: SecretNamespace
+      type: string
+    schema:
+      openAPIV3Schema:
+        description: ClusterPullSecret is the Schema for the clusterpullsecrets API
+        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: ClusterPullSecretSpec defines the desired state of ClusterPullSecret
+            properties:
+              secretRef:
+                type: object
+            type: object
+          status:
+            description: ClusterPullSecretStatus defines the observed state of ClusterPullSecret
+            type: object
+        type: object
 status:
   acceptedNames:
     kind: ""
@@ -78,8 +77,6 @@ rules:
   - update
   - patch
 ---
-
----
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:

manifest.jps

@@ -1139,8 +1139,8 @@ addons:
       - cmd[${nodes.k8sm.master.id}]: |-
           kubectl apply -f ${baseUrl}/addons/registry-creds/registry-creds-system.yaml
           wait-deployment.sh registry-creds-registry-creds-controller registry-creds-system 1 600
-          kubectl -n kube-system delete secret dockerhub-credentials-secret
           kubectl delete -f ${baseUrl}/addons/registry-creds/dockerhub-secret.yaml
+          kubectl -n kube-system delete secret dockerhub-credentials-secret
           kubectl -n kube-system create secret docker-registry dockerhub-credentials-secret --docker-username='${settings.creds_username}' --docker-password='${settings.creds_password}' --docker-email='${settings.creds_email}'
           kubectl apply -f ${baseUrl}/addons/registry-creds/dockerhub-secret.yaml