make apimachinery crds gomod, update-expected.sh

kubernetes · Aug 24, 2020 · e496d55 · e496d55
1 parent 065c1b8
commit e496d55
Show file tree

Hide file tree

Showing 18 changed files with 746 additions and 1,872 deletions.
diff --git a/k8s/crds/kops.k8s.io_clusters.yaml b/k8s/crds/kops.k8s.io_clusters.yaml
diff --git a/k8s/crds/kops.k8s.io_instancegroups.yaml b/k8s/crds/kops.k8s.io_instancegroups.yaml
diff --git a/k8s/crds/kops.k8s.io_keysets.yaml b/k8s/crds/kops.k8s.io_keysets.yaml
@@ -19,18 +19,13 @@ spec:
   - name: v1alpha2
     schema:
       openAPIV3Schema:
-        description: Keyset is a set of system keypairs, or other secret material.
-          It is a set to support credential rotation etc.
+        description: Keyset is a set of system keypairs, or other secret material. It is a set to support credential rotation etc.
         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'
+            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'
+            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
@@ -40,28 +35,23 @@ spec:
               keys:
                 description: Keys is the set of keys that make up the keyset
                 items:
-                  description: KeysetItem is an item (keypair or other secret material)
-                    in a Keyset
+                  description: KeysetItem is an item (keypair or other secret material) in a Keyset
                   properties:
                     id:
-                      description: Id is the unique identifier for this key in the
-                        keyset
+                      description: Id is the unique identifier for this key in the keyset
                       type: string
                     privateMaterial:
-                      description: PrivateMaterial holds secret material (e.g. a private
-                        key, or symmetric token)
+                      description: PrivateMaterial holds secret material (e.g. a private key, or symmetric token)
                       format: byte
                       type: string
                     publicMaterial:
-                      description: PublicMaterial holds non-secret material (e.g.
-                        a certificate)
+                      description: PublicMaterial holds non-secret material (e.g. a certificate)
                       format: byte
                       type: string
                   type: object
                 type: array
               type:
-                description: Type is the type of the Keyset (PKI keypair, or secret
-                  token)
+                description: Type is the type of the Keyset (PKI keypair, or secret token)
                 type: string
             type: object
         type: object

diff --git a/k8s/crds/kops.k8s.io_sshcredentials.yaml b/k8s/crds/kops.k8s.io_sshcredentials.yaml
@@ -22,14 +22,10 @@ spec:
         description: SSHCredential represent a set of kops secrets
         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'
+            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'
+            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

diff --git a/pkg/client/clientset_generated/clientset/fake/register.go b/pkg/client/clientset_generated/clientset/fake/register.go
diff --git a/pkg/client/clientset_generated/internalclientset/fake/register.go b/pkg/client/clientset_generated/internalclientset/fake/register.go
diff --git a/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml b/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml
@@ -79,14 +79,7 @@ Contents:
       - command:
         - /bin/sh
         - -c
-        - mkfifo /tmp/pipe; (tee -a /var/log/etcd.log < /tmp/pipe & ) ; exec /etcd-manager
-          --backup-store=memfs://clusters.example.com/minimal.example.com/backups/etcd-events
-          --client-urls=https://__name__:4002 --cluster-name=etcd-events --containerized=true
-          --dns-suffix=.internal.minimal.example.com --etcd-insecure=true --grpc-port=3997
-          --insecure=false --peer-urls=https://__name__:2381 --quarantine-client-urls=https://__name__:3995
-          --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events
-          --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned
-          > /tmp/pipe 2>&1
+        - mkfifo /tmp/pipe; (tee -a /var/log/etcd.log < /tmp/pipe & ) ; exec /etcd-manager --backup-store=memfs://clusters.example.com/minimal.example.com/backups/etcd-events --client-urls=https://__name__:4002 --cluster-name=etcd-events --containerized=true --dns-suffix=.internal.minimal.example.com --etcd-insecure=true --grpc-port=3997 --insecure=false --peer-urls=https://__name__:2381 --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1
         image: kopeio/etcd-manager:3.0.20200531
         name: etcd-manager
         resources:
@@ -145,14 +138,7 @@ Contents:
       - command:
         - /bin/sh
         - -c
-        - mkfifo /tmp/pipe; (tee -a /var/log/etcd.log < /tmp/pipe & ) ; exec /etcd-manager
-          --backup-store=memfs://clusters.example.com/minimal.example.com/backups/etcd-main
-          --client-urls=https://__name__:4001 --cluster-name=etcd --containerized=true
-          --dns-suffix=.internal.minimal.example.com --etcd-insecure=true --grpc-port=3996
-          --insecure=false --peer-urls=https://__name__:2380 --quarantine-client-urls=https://__name__:3994
-          --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main
-          --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned
-          > /tmp/pipe 2>&1
+        - mkfifo /tmp/pipe; (tee -a /var/log/etcd.log < /tmp/pipe & ) ; exec /etcd-manager --backup-store=memfs://clusters.example.com/minimal.example.com/backups/etcd-main --client-urls=https://__name__:4001 --cluster-name=etcd --containerized=true --dns-suffix=.internal.minimal.example.com --etcd-insecure=true --grpc-port=3996 --insecure=false --peer-urls=https://__name__:2380 --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1
         image: kopeio/etcd-manager:3.0.20200531
         name: etcd-manager
         resources:

diff --git a/pkg/model/components/etcdmanager/tests/old_versions_mount_hosts/tasks.yaml b/pkg/model/components/etcdmanager/tests/old_versions_mount_hosts/tasks.yaml
@@ -79,14 +79,7 @@ Contents:
       - command:
         - /bin/sh
         - -c
-        - mkfifo /tmp/pipe; (tee -a /var/log/etcd.log < /tmp/pipe & ) ; exec /etcd-manager
-          --backup-store=memfs://clusters.example.com/minimal.example.com/backups/etcd-events
-          --client-urls=https://__name__:4002 --cluster-name=etcd-events --containerized=true
-          --dns-suffix=.internal.minimal.example.com --etcd-insecure=true --grpc-port=3997
-          --insecure=false --peer-urls=https://__name__:2381 --quarantine-client-urls=https://__name__:3995
-          --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events
-          --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned
-          > /tmp/pipe 2>&1
+        - mkfifo /tmp/pipe; (tee -a /var/log/etcd.log < /tmp/pipe & ) ; exec /etcd-manager --backup-store=memfs://clusters.example.com/minimal.example.com/backups/etcd-events --client-urls=https://__name__:4002 --cluster-name=etcd-events --containerized=true --dns-suffix=.internal.minimal.example.com --etcd-insecure=true --grpc-port=3997 --insecure=false --peer-urls=https://__name__:2381 --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1
         image: kopeio/etcd-manager:3.0.20200531
         name: etcd-manager
         resources:
@@ -151,14 +144,7 @@ Contents:
       - command:
         - /bin/sh
         - -c
-        - mkfifo /tmp/pipe; (tee -a /var/log/etcd.log < /tmp/pipe & ) ; exec /etcd-manager
-          --backup-store=memfs://clusters.example.com/minimal.example.com/backups/etcd-main
-          --client-urls=https://__name__:4001 --cluster-name=etcd --containerized=true
-          --dns-suffix=.internal.minimal.example.com --etcd-insecure=true --grpc-port=3996
-          --insecure=false --peer-urls=https://__name__:2380 --quarantine-client-urls=https://__name__:3994
-          --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main
-          --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned
-          > /tmp/pipe 2>&1
+        - mkfifo /tmp/pipe; (tee -a /var/log/etcd.log < /tmp/pipe & ) ; exec /etcd-manager --backup-store=memfs://clusters.example.com/minimal.example.com/backups/etcd-main --client-urls=https://__name__:4001 --cluster-name=etcd --containerized=true --dns-suffix=.internal.minimal.example.com --etcd-insecure=true --grpc-port=3996 --insecure=false --peer-urls=https://__name__:2380 --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1
         image: kopeio/etcd-manager:3.0.20200531
         name: etcd-manager
         resources:

diff --git a/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml b/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml
@@ -79,14 +79,7 @@ Contents:
       - command:
         - /bin/sh
         - -c
-        - mkfifo /tmp/pipe; (tee -a /var/log/etcd.log < /tmp/pipe & ) ; exec /etcd-manager
-          --backup-store=memfs://clusters.example.com/minimal.example.com/backups/etcd-events
-          --client-urls=https://__name__:4002 --cluster-name=etcd-events --containerized=true
-          --dns-suffix=.internal.minimal.example.com --etcd-insecure=true --grpc-port=3997
-          --insecure=false --peer-urls=https://__name__:2381 --quarantine-client-urls=https://__name__:3995
-          --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events
-          --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned
-          > /tmp/pipe 2>&1
+        - mkfifo /tmp/pipe; (tee -a /var/log/etcd.log < /tmp/pipe & ) ; exec /etcd-manager --backup-store=memfs://clusters.example.com/minimal.example.com/backups/etcd-events --client-urls=https://__name__:4002 --cluster-name=etcd-events --containerized=true --dns-suffix=.internal.minimal.example.com --etcd-insecure=true --grpc-port=3997 --insecure=false --peer-urls=https://__name__:2381 --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1
         env:
         - name: ETCD_QUOTA_BACKEND_BYTES
           value: "10737418240"
@@ -148,14 +141,7 @@ Contents:
       - command:
         - /bin/sh
         - -c
-        - mkfifo /tmp/pipe; (tee -a /var/log/etcd.log < /tmp/pipe & ) ; exec /etcd-manager
-          --backup-store=memfs://clusters.example.com/minimal.example.com/backups/etcd-main
-          --client-urls=https://__name__:4001 --cluster-name=etcd --containerized=true
-          --dns-suffix=.internal.minimal.example.com --etcd-insecure=true --grpc-port=3996
-          --insecure=false --peer-urls=https://__name__:2380 --quarantine-client-urls=https://__name__:3994
-          --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main
-          --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned
-          > /tmp/pipe 2>&1
+        - mkfifo /tmp/pipe; (tee -a /var/log/etcd.log < /tmp/pipe & ) ; exec /etcd-manager --backup-store=memfs://clusters.example.com/minimal.example.com/backups/etcd-main --client-urls=https://__name__:4001 --cluster-name=etcd --containerized=true --dns-suffix=.internal.minimal.example.com --etcd-insecure=true --grpc-port=3996 --insecure=false --peer-urls=https://__name__:2380 --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1
         env:
         - name: ETCD_QUOTA_BACKEND_BYTES
           value: "10737418240"

diff --git a/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml b/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml
@@ -79,14 +79,7 @@ Contents:
       - command:
         - /bin/sh
         - -c
-        - mkfifo /tmp/pipe; (tee -a /var/log/etcd.log < /tmp/pipe & ) ; exec /etcd-manager
-          --backup-store=memfs://clusters.example.com/minimal.example.com/backups/etcd-events
-          --client-urls=https://__name__:4002 --cluster-name=etcd-events --containerized=true
-          --dns-suffix=.internal.minimal.example.com --etcd-insecure=true --grpc-port=3997
-          --insecure=false --peer-urls=https://__name__:2381 --quarantine-client-urls=https://__name__:3995
-          --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events
-          --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned
-          > /tmp/pipe 2>&1
+        - mkfifo /tmp/pipe; (tee -a /var/log/etcd.log < /tmp/pipe & ) ; exec /etcd-manager --backup-store=memfs://clusters.example.com/minimal.example.com/backups/etcd-events --client-urls=https://__name__:4002 --cluster-name=etcd-events --containerized=true --dns-suffix=.internal.minimal.example.com --etcd-insecure=true --grpc-port=3997 --insecure=false --peer-urls=https://__name__:2381 --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1
         env:
         - name: NO_PROXY
           value: noproxy.example.com
@@ -160,14 +153,7 @@ Contents:
       - command:
         - /bin/sh
         - -c
-        - mkfifo /tmp/pipe; (tee -a /var/log/etcd.log < /tmp/pipe & ) ; exec /etcd-manager
-          --backup-store=memfs://clusters.example.com/minimal.example.com/backups/etcd-main
-          --client-urls=https://__name__:4001 --cluster-name=etcd --containerized=true
-          --dns-suffix=.internal.minimal.example.com --etcd-insecure=true --grpc-port=3996
-          --insecure=false --peer-urls=https://__name__:2380 --quarantine-client-urls=https://__name__:3994
-          --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main
-          --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned
-          > /tmp/pipe 2>&1
+        - mkfifo /tmp/pipe; (tee -a /var/log/etcd.log < /tmp/pipe & ) ; exec /etcd-manager --backup-store=memfs://clusters.example.com/minimal.example.com/backups/etcd-main --client-urls=https://__name__:4001 --cluster-name=etcd --containerized=true --dns-suffix=.internal.minimal.example.com --etcd-insecure=true --grpc-port=3996 --insecure=false --peer-urls=https://__name__:2380 --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1
         env:
         - name: NO_PROXY
           value: noproxy.example.com

diff --git a/protokube/tests/integration/build_etcd_manifest/main/etcd_env_vars.yaml b/protokube/tests/integration/build_etcd_manifest/main/etcd_env_vars.yaml
@@ -38,8 +38,7 @@ spec:
   - command:
     - /bin/sh
     - -c
-    - mkfifo /tmp/pipe; (tee -a /var/log/etcd.log < /tmp/pipe & ) ; exec /usr/local/bin/etcd  >
-      /tmp/pipe 2>&1
+    - mkfifo /tmp/pipe; (tee -a /var/log/etcd.log < /tmp/pipe & ) ; exec /usr/local/bin/etcd  > /tmp/pipe 2>&1
     env:
     - name: ETCD_NAME
       value: node0

diff --git a/protokube/tests/integration/build_etcd_manifest/main/non_tls.yaml b/protokube/tests/integration/build_etcd_manifest/main/non_tls.yaml
@@ -36,8 +36,7 @@ spec:
   - command:
     - /bin/sh
     - -c
-    - mkfifo /tmp/pipe; (tee -a /var/log/etcd.log < /tmp/pipe & ) ; exec /usr/local/bin/etcd  >
-      /tmp/pipe 2>&1
+    - mkfifo /tmp/pipe; (tee -a /var/log/etcd.log < /tmp/pipe & ) ; exec /usr/local/bin/etcd  > /tmp/pipe 2>&1
     env:
     - name: ETCD_NAME
       value: node0

diff --git a/protokube/tests/integration/build_etcd_manifest/main/tls.yaml b/protokube/tests/integration/build_etcd_manifest/main/tls.yaml
@@ -42,8 +42,7 @@ spec:
   - command:
     - /bin/sh
     - -c
-    - mkfifo /tmp/pipe; (tee -a /var/log/etcd.log < /tmp/pipe & ) ; exec /usr/local/bin/etcd  >
-      /tmp/pipe 2>&1
+    - mkfifo /tmp/pipe; (tee -a /var/log/etcd.log < /tmp/pipe & ) ; exec /usr/local/bin/etcd  > /tmp/pipe 2>&1
     env:
     - name: ETCD_NAME
       value: node0

diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml
@@ -21,7 +21,7 @@ spec:
   - id: k8s-1.6
     kubernetesVersion: <1.12.0
     manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml
-    manifestHash: 79dc1f02e5b03f6cfd06631bf26a9e4d3cb304f6
+    manifestHash: a50e6a4c2f800b4af4ac0d80edf7762cfc1de9e3
     name: kube-dns.addons.k8s.io
     selector:
       k8s-addon: kube-dns.addons.k8s.io
@@ -57,7 +57,7 @@ spec:
   - id: k8s-1.6
     kubernetesVersion: <1.12.0
     manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
-    manifestHash: efb6c7b28be1e4cfe493f01b4a9f81a54f69f120
+    manifestHash: a40fd3c1a3191a63eee6b829d90731f4488bea07
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io

diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml
@@ -21,7 +21,7 @@ spec:
   - id: k8s-1.6
     kubernetesVersion: <1.12.0
     manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml
-    manifestHash: 79dc1f02e5b03f6cfd06631bf26a9e4d3cb304f6
+    manifestHash: a50e6a4c2f800b4af4ac0d80edf7762cfc1de9e3
     name: kube-dns.addons.k8s.io
     selector:
       k8s-addon: kube-dns.addons.k8s.io
@@ -57,7 +57,7 @@ spec:
   - id: k8s-1.6
     kubernetesVersion: <1.12.0
     manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
-    manifestHash: efb6c7b28be1e4cfe493f01b4a9f81a54f69f120
+    manifestHash: a40fd3c1a3191a63eee6b829d90731f4488bea07
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io