rebase on cli-runtime change

ko-build · Aug 10, 2021 · 9d20e36 · 9d20e36
1 parent 5413ef4
commit 9d20e36
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 34 deletions.
diff --git a/doc/ko_apply.md b/doc/ko_apply.md
@@ -36,45 +36,51 @@ ko apply -f FILENAME [flags]
 
   # Apply from stdin:
   cat config.yaml | ko apply -f -
+
+  # Any flags passed after '--' are passed to 'kubectl apply' directly:
+  ko apply -f config -- --namespace=foo --kubeconfig=cfg.yaml
+  
 ```
 
 ### Options
 
 ```
-      --as string                      Username to impersonate for the operation
-      --as-group stringArray           Group to impersonate for the operation, this flag can be repeated to specify multiple groups.
+      --as string                      Username to impersonate for the operation (DEPRECATED)
+      --as-group stringArray           Group to impersonate for the operation, this flag can be repeated to specify multiple groups. (DEPRECATED)
       --bare                           Whether to just use KO_DOCKER_REPO without additional context (may not work properly with --tags).
   -B, --base-import-paths              Whether to use the base path without MD5 hash after KO_DOCKER_REPO (may not work properly with --tags).
-      --cache-dir string               Default cache directory (default "/Users/jasonhall/.kube/cache")
-      --certificate-authority string   Path to a cert file for the certificate authority
-      --client-certificate string      Path to a client certificate file for TLS
-      --client-key string              Path to a client key file for TLS
-      --cluster string                 The name of the kubeconfig cluster to use
-      --context string                 The name of the kubeconfig context to use
+      --cache-dir string               Default cache directory (DEPRECATED)
+      --certificate-authority string   Path to a cert file for the certificate authority (DEPRECATED)
+      --client-certificate string      Path to a client certificate file for TLS (DEPRECATED)
+      --client-key string              Path to a client key file for TLS (DEPRECATED)
+      --cluster string                 The name of the kubeconfig cluster to use (DEPRECATED)
+      --context string                 The name of the kubeconfig context to use (DEPRECATED)
       --disable-optimizations          Disable optimizations when building Go code. Useful when you want to interactively debug the created container.
   -f, --filename strings               Filename, directory, or URL to files to use to create the resource
   -h, --help                           help for apply
       --image-label strings            Which labels (key=value) to add to the image.
       --insecure-registry              Whether to skip TLS verification on the registry
-      --insecure-skip-tls-verify       If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure
+      --insecure-skip-tls-verify       If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure (DEPRECATED)
   -j, --jobs int                       The maximum number of concurrent builds (default GOMAXPROCS)
-      --kubeconfig string              Path to the kubeconfig file to use for CLI requests.
+      --kubeconfig string              Path to the kubeconfig file to use for CLI requests. (DEPRECATED)
   -L, --local                          Load into images to local docker daemon.
-  -n, --namespace string               If present, the namespace scope for this CLI request
+  -n, --namespace string               If present, the namespace scope for this CLI request (DEPRECATED)
       --oci-layout-path string         Path to save the OCI image layout of the built images
+      --password string                Password for basic authentication to the API server (DEPRECATED)
       --platform string                Which platform to use when pulling a multi-platform base. Format: all | <os>[/<arch>[/<variant>]][,platform]*
   -P, --preserve-import-paths          Whether to preserve the full import path after KO_DOCKER_REPO.
       --push                           Push images to KO_DOCKER_REPO (default true)
   -R, --recursive                      Process the directory used in -f, --filename recursively. Useful when you want to manage related manifests organized within the same directory.
-      --request-timeout string         The length of time to wait before giving up on a single server request. Non-zero values should contain a corresponding time unit (e.g. 1s, 2m, 3h). A value of zero means don't timeout requests. (default "0")
+      --request-timeout string         The length of time to wait before giving up on a single server request. Non-zero values should contain a corresponding time unit (e.g. 1s, 2m, 3h). A value of zero means don't timeout requests. (DEPRECATED)
   -l, --selector string                Selector (label query) to filter on, supports '=', '==', and '!='.(e.g. -l key1=value1,key2=value2)
-  -s, --server string                  The address and port of the Kubernetes API server
+  -s, --server string                  The address and port of the Kubernetes API server (DEPRECATED)
       --tag-only                       Include tags but not digests in resolved image references. Useful when digests are not preserved when images are repopulated.
   -t, --tags strings                   Which tags to use for the produced image instead of the default 'latest' tag (may not work properly with --base-import-paths or --bare). (default [latest])
       --tarball string                 File to save images tarballs
-      --tls-server-name string         Server name to use for server certificate validation. If it is not provided, the hostname used to contact the server is used
-      --token string                   Bearer token for authentication to the API server
-      --user string                    The name of the kubeconfig user to use
+      --tls-server-name string         Server name to use for server certificate validation. If it is not provided, the hostname used to contact the server is used (DEPRECATED)
+      --token string                   Bearer token for authentication to the API server (DEPRECATED)
+      --user string                    The name of the kubeconfig user to use (DEPRECATED)
+      --username string                Username for basic authentication to the API server (DEPRECATED)
   -W, --watch                          Continuously monitor the transitive dependencies of the passed yaml files, and redeploy whenever anything changes.
 ```
 

diff --git a/doc/ko_create.md b/doc/ko_create.md
@@ -36,45 +36,51 @@ ko create -f FILENAME [flags]
 
   # Create from stdin:
   cat config.yaml | ko create -f -
+
+  # Any flags passed after '--' are passed to 'kubectl apply' directly:
+  ko apply -f config -- --namespace=foo --kubeconfig=cfg.yaml
+  
 ```
 
 ### Options
 
 ```
-      --as string                      Username to impersonate for the operation
-      --as-group stringArray           Group to impersonate for the operation, this flag can be repeated to specify multiple groups.
+      --as string                      Username to impersonate for the operation (DEPRECATED)
+      --as-group stringArray           Group to impersonate for the operation, this flag can be repeated to specify multiple groups. (DEPRECATED)
       --bare                           Whether to just use KO_DOCKER_REPO without additional context (may not work properly with --tags).
   -B, --base-import-paths              Whether to use the base path without MD5 hash after KO_DOCKER_REPO (may not work properly with --tags).
-      --cache-dir string               Default cache directory (default "/Users/jasonhall/.kube/cache")
-      --certificate-authority string   Path to a cert file for the certificate authority
-      --client-certificate string      Path to a client certificate file for TLS
-      --client-key string              Path to a client key file for TLS
-      --cluster string                 The name of the kubeconfig cluster to use
-      --context string                 The name of the kubeconfig context to use
+      --cache-dir string               Default cache directory (DEPRECATED)
+      --certificate-authority string   Path to a cert file for the certificate authority (DEPRECATED)
+      --client-certificate string      Path to a client certificate file for TLS (DEPRECATED)
+      --client-key string              Path to a client key file for TLS (DEPRECATED)
+      --cluster string                 The name of the kubeconfig cluster to use (DEPRECATED)
+      --context string                 The name of the kubeconfig context to use (DEPRECATED)
       --disable-optimizations          Disable optimizations when building Go code. Useful when you want to interactively debug the created container.
   -f, --filename strings               Filename, directory, or URL to files to use to create the resource
   -h, --help                           help for create
       --image-label strings            Which labels (key=value) to add to the image.
       --insecure-registry              Whether to skip TLS verification on the registry
-      --insecure-skip-tls-verify       If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure
+      --insecure-skip-tls-verify       If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure (DEPRECATED)
   -j, --jobs int                       The maximum number of concurrent builds (default GOMAXPROCS)
-      --kubeconfig string              Path to the kubeconfig file to use for CLI requests.
+      --kubeconfig string              Path to the kubeconfig file to use for CLI requests. (DEPRECATED)
   -L, --local                          Load into images to local docker daemon.
-  -n, --namespace string               If present, the namespace scope for this CLI request
+  -n, --namespace string               If present, the namespace scope for this CLI request (DEPRECATED)
       --oci-layout-path string         Path to save the OCI image layout of the built images
+      --password string                Password for basic authentication to the API server (DEPRECATED)
       --platform string                Which platform to use when pulling a multi-platform base. Format: all | <os>[/<arch>[/<variant>]][,platform]*
   -P, --preserve-import-paths          Whether to preserve the full import path after KO_DOCKER_REPO.
       --push                           Push images to KO_DOCKER_REPO (default true)
   -R, --recursive                      Process the directory used in -f, --filename recursively. Useful when you want to manage related manifests organized within the same directory.
-      --request-timeout string         The length of time to wait before giving up on a single server request. Non-zero values should contain a corresponding time unit (e.g. 1s, 2m, 3h). A value of zero means don't timeout requests. (default "0")
+      --request-timeout string         The length of time to wait before giving up on a single server request. Non-zero values should contain a corresponding time unit (e.g. 1s, 2m, 3h). A value of zero means don't timeout requests. (DEPRECATED)
   -l, --selector string                Selector (label query) to filter on, supports '=', '==', and '!='.(e.g. -l key1=value1,key2=value2)
-  -s, --server string                  The address and port of the Kubernetes API server
+  -s, --server string                  The address and port of the Kubernetes API server (DEPRECATED)
       --tag-only                       Include tags but not digests in resolved image references. Useful when digests are not preserved when images are repopulated.
   -t, --tags strings                   Which tags to use for the produced image instead of the default 'latest' tag (may not work properly with --base-import-paths or --bare). (default [latest])
       --tarball string                 File to save images tarballs
-      --tls-server-name string         Server name to use for server certificate validation. If it is not provided, the hostname used to contact the server is used
-      --token string                   Bearer token for authentication to the API server
-      --user string                    The name of the kubeconfig user to use
+      --tls-server-name string         Server name to use for server certificate validation. If it is not provided, the hostname used to contact the server is used (DEPRECATED)
+      --token string                   Bearer token for authentication to the API server (DEPRECATED)
+      --user string                    The name of the kubeconfig user to use (DEPRECATED)
+      --username string                Username for basic authentication to the API server (DEPRECATED)
   -W, --watch                          Continuously monitor the transitive dependencies of the passed yaml files, and redeploy whenever anything changes.
 ```
 

diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -16,8 +16,6 @@ github.com/containerd/stargz-snapshotter/estargz/errorutil
 # github.com/cpuguy83/go-md2man/v2 v2.0.1
 ## explicit
 github.com/cpuguy83/go-md2man/v2/md2man
-# github.com/davecgh/go-spew v1.1.1
-github.com/davecgh/go-spew/spew
 # github.com/docker/cli v20.10.7+incompatible
 github.com/docker/cli/cli/config
 github.com/docker/cli/cli/config/configfile