Skip to content

Commit da0ce3b

Browse files
Cornelius Weigbalopat
Cornelius Weig
authored andcommitted
Improve manual installation instruction for windows (GoogleContainerTools#1883)
* Mention that binary needs to be renamed on Windows * Strip trailing whitespace in docs Signed-off-by: Cornelius Weig <[email protected]> * Make sure release notes are created without trailing whitespace * Add shebang line in release.sh Signed-off-by: Cornelius Weig <[email protected]> * Remove trailing whitespace in usage string
1 parent c9b35ba commit da0ce3b

File tree

19 files changed

+191
-189
lines changed

19 files changed

+191
-189
lines changed

.github/ISSUE_TEMPLATE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!--
1+
<!--
22
Issues without logs and details are more complicated to fix.
33
Please help us by filling the template below!
44
-->

CHANGELOG.md

+55-55
Large diffs are not rendered by default.

CODE_OF_CONDUCT.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ dispute. If you are unable to resolve the matter for any reason, or if the
6969
behavior is threatening or harassing, report it. We are dedicated to providing
7070
an environment where participants feel welcome and safe.
7171

72-
Reports should be directed to the maintainers, the Project Steward(s) for
73-
Skaffold. It is the Project Steward’s duty to receive and address reported
74-
violations of the code of conduct. They will then work with a committee
75-
consisting of representatives from the Open Source Programs Office and the
76-
Google Open Source Strategy team. If for any reason you are uncomfortable
72+
Reports should be directed to the maintainers, the Project Steward(s) for
73+
Skaffold. It is the Project Steward’s duty to receive and address reported
74+
violations of the code of conduct. They will then work with a committee
75+
consisting of representatives from the Open Source Programs Office and the
76+
Google Open Source Strategy team. If for any reason you are uncomfortable
7777
reaching out the Project Steward, please email [email protected].
7878

7979
We will investigate every complaint, but you may not receive a direct response.

README.md

+21-21
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,26 @@ provides building blocks and describe customizations for a CI/CD pipeline.
1616
* Fast local Kubernetes Development
1717
* **optimized source-to-k8s** - Skaffold detects changes in your source code and handles the pipeline to
1818
**build**, **push**, and **deploy** your application automatically with **policy based image tagging** and **highly optimized, fast local workflows**
19-
* **continuous feedback** - Skaffold automatically manages logging and port-forwarding
19+
* **continuous feedback** - Skaffold automatically manages logging and port-forwarding
2020
* Skaffold projects work everywhere
2121
* **share with other developers** - Skaffold is the easiest way to **share your project** with the world: `git clone` and `skaffold run`
2222
* **context aware** - use Skaffold profiles, user level config, environment variables and flags to describe differences in environments
23-
* **CI/CD building blocks** - use `skaffold run` end-to-end or just part of skaffold stages from build to deployment in your CI/CD system
24-
* skaffold.yaml - a single pluggable, declarative configuration for your project
23+
* **CI/CD building blocks** - use `skaffold run` end-to-end or just part of skaffold stages from build to deployment in your CI/CD system
24+
* skaffold.yaml - a single pluggable, declarative configuration for your project
2525
* **skaffold init** - Skaffold discovers your files and generates its own config file
26-
* **multi-component apps** - Skaffold supports applications consisting of multiple components
26+
* **multi-component apps** - Skaffold supports applications consisting of multiple components
2727
* **bring your own tools** - Skaffold has a pluggable architecture to allow for different implementations of the stages
28-
* Lightweight
28+
* Lightweight
2929
* **client-side only** - Skaffold does not require maintaining a cluster-side component, so there is no overhead or maintenance burden to
3030
your cluster.
31-
* **minimal pipeline** - Skaffold provides an opinionated, minimal pipeline to keep things simple
31+
* **minimal pipeline** - Skaffold provides an opinionated, minimal pipeline to keep things simple
3232

3333
## Install
3434
Installation methods can be found in the [Getting Started Guide](https://skaffold.dev/docs/getting-started/#installing-skaffold).
3535

3636
See [Github Releases](https://github.com/GoogleContainerTools/skaffold/releases) for more information.
3737

38-
## Demo
38+
## Demo
3939

4040
![](docs/static/images/intro.gif)
4141

@@ -45,18 +45,18 @@ Skaffold simplifies your development workflow by organizing common development
4545
stages into one simple command. Every time you run `skaffold dev`, the system
4646

4747
1. Collects and watches your source code for changes
48-
1. Syncs files directly to pods if user marks them as syncable
48+
1. Syncs files directly to pods if user marks them as syncable
4949
1. Builds artifacts from the source code
5050
1. Tests the built artifacts using container-structure-tests
5151
1. Tags the artifacts
5252
1. Pushes the artifacts
5353
1. Deploys the artifacts
5454
1. Monitors the deployed artifacts
55-
1. Cleans up deployed artifacts on exit (Ctrl+C)
56-
55+
1. Cleans up deployed artifacts on exit (Ctrl+C)
56+
5757
What's more, the pluggable architecture is central to Skaffold's design, allowing you to use
5858
the tool you prefer in each stage. Also, Skaffold's `profiles` feature grants
59-
you the freedom to switch tools as you see fit depending on the context.
59+
you the freedom to switch tools as you see fit depending on the context.
6060

6161
For example, if you are coding on a local machine, you can configure Skaffold to build artifacts
6262
with local Docker daemon and deploy them to minikube
@@ -72,25 +72,25 @@ Skaffold supports the following tools:
7272
* Dockerfile on cloud (Google Cloud Build)
7373
* Bazel locally
7474
* Jib Maven/Gradle locally
75-
* Test
75+
* Test
7676
* with container-structure-test
77-
* Deploy
77+
* Deploy
7878
* Kubernetes Command-Line Interface (`kubectl`)
7979
* Helm
8080
* kustomize
81-
* Tag
81+
* Tag
8282
* tag by git commit
83-
* tag by current date&time
83+
* tag by current date&time
8484
* tag by environment variables based template
8585
* tag by checksum of the source code
86-
* Push
86+
* Push
8787
* don't push - keep the image on the local daemon
88-
* push to registry
88+
* push to registry
8989

9090
![architecture](docs/static/images/architecture.png)
9191

9292

93-
Besides the above steps, skaffold also automatically manages the following utilities for you:
93+
Besides the above steps, skaffold also automatically manages the following utilities for you:
9494

9595
* forwards container ports to your local machine using `kubectl port-forward`
9696
* aggregates all the logs from the deployed pods
@@ -100,7 +100,7 @@ Besides the above steps, skaffold also automatically manages the following utili
100100

101101
Documentation for latest release: http://skaffold.dev
102102

103-
Documentation for latest build: http://skaffold-latest.firebaseapp.com
103+
Documentation for latest build: http://skaffold-latest.firebaseapp.com
104104

105105
## More examples
106106

@@ -111,8 +111,8 @@ Check out our [examples page](./examples)
111111
- [skaffold-users mailing list](https://groups.google.com/forum/#!forum/skaffold-users)
112112
- [#skaffold on Kubernetes Slack](https://kubernetes.slack.com/messages/CABQMSZA6/)
113113

114-
There is a bi-weekly Skaffold users meeting at 9:30am-10am PST hosted on hangouts under "skaffold".
115-
Everyone is welcome to add suggestions to the [agenda](https://docs.google.com/document/d/1mnCC_fAI3pmg3Vb2nMJyPk8Qtjjuapw_BTyqI_dX7sk/edit) and attend.
114+
There is a bi-weekly Skaffold users meeting at 9:30am-10am PST hosted on hangouts under "skaffold".
115+
Everyone is welcome to add suggestions to the [agenda](https://docs.google.com/document/d/1mnCC_fAI3pmg3Vb2nMJyPk8Qtjjuapw_BTyqI_dX7sk/edit) and attend.
116116
Join the [skaffold-users mailing list](https://groups.google.com/forum/#!forum/skaffold-users) to get the calendar invite directly on your calendar.
117117

118118

cmd/skaffold/app/cmd/build.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func NewCmdBuild(out io.Writer) *cobra.Command {
5555
}
5656
AddRunDevFlags(cmd)
5757
cmd.Flags().StringArrayVarP(&opts.TargetImages, "build-image", "b", nil, "Choose which artifacts to build. Artifacts with image names that contain the expression will be built only. Default is to build sources for all artifacts")
58-
cmd.Flags().BoolVarP(&quietFlag, "quiet", "q", false, "Suppress the build output and print image built on success. See --output to format output. ")
58+
cmd.Flags().BoolVarP(&quietFlag, "quiet", "q", false, "Suppress the build output and print image built on success. See --output to format output.")
5959
cmd.Flags().VarP(buildFormatFlag, "output", "o", "Used in conjuction with --quiet flag. "+buildFormatFlag.Usage())
6060
return cmd
6161
}

docs/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Skaffold site
1+
# Skaffold site
22

3-
The site for the last stable release is on: http://skaffold.dev
4-
The site for the last build from master is on: http://skaffold-latest.firebaseapp.com
3+
The site for the last stable release is on: http://skaffold.dev
4+
The site for the last build from master is on: http://skaffold-latest.firebaseapp.com

docs/content/en/docs/_index.md

+16-16
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,21 @@ provides building blocks and describe customizations for a CI/CD pipeline.
1818
* Fast local Kubernetes Development
1919
* **optimized "Source to Kubernetes"** - Skaffold detects changes in your source code and handles the pipeline to
2020
**build**, **push**, and **deploy** your application automatically with **policy based image tagging** and **highly optimized, fast local workflows**
21-
* **continuous feedback** - Skaffold automatically manages logging and port-forwarding
21+
* **continuous feedback** - Skaffold automatically manages logging and port-forwarding
2222
* Skaffold projects work everywhere
2323
* **share with other developers** - Skaffold is the easiest way to **share your project** with the world: `git clone` and `skaffold run`
2424
* **context aware** - use Skaffold profiles, user level config, environment variables and flags to describe differences in environments
25-
* **CI/CD building blocks** - use `skaffold run` end-to-end or just part of Skaffold stages from build to deployment in your CI/CD system
26-
* skaffold.yaml - a single pluggable, declarative configuration for your project
25+
* **CI/CD building blocks** - use `skaffold run` end-to-end or just part of Skaffold stages from build to deployment in your CI/CD system
26+
* skaffold.yaml - a single pluggable, declarative configuration for your project
2727
* **skaffold init** - Skaffold discovers your files and generates its own config file
28-
* **multi-component apps** - Skaffold supports applications consisting of multiple components
28+
* **multi-component apps** - Skaffold supports applications consisting of multiple components
2929
* **bring your own tools** - Skaffold has a pluggable architecture to allow for different implementations of the stages
30-
* Lightweight
30+
* Lightweight
3131
* **client-side only** - Skaffold does not require maintaining a cluster-side component, so there is no overhead or maintenance burden to
3232
your cluster.
33-
* **minimal pipeline** - Skaffold provides an opinionated, minimal pipeline to keep things simple
33+
* **minimal pipeline** - Skaffold provides an opinionated, minimal pipeline to keep things simple
3434

35-
## Demo
35+
## Demo
3636

3737
![architecture](/images/intro.gif)
3838

@@ -42,22 +42,22 @@ Skaffold simplifies your development workflow by organizing common development
4242
stages into one simple command. Every time you run `skaffold dev`, the system
4343

4444
1. Collects and watches your source code for changes
45-
1. Syncs files directly to pods if user marks them as syncable
45+
1. Syncs files directly to pods if user marks them as syncable
4646
1. Builds artifacts from the source code
4747
1. Tests the built artifacts using [container-structure-tests](https://github.com/GoogleContainerTools/container-structure-test)
4848
1. Tags the artifacts
4949
1. Pushes the artifacts
5050
1. Deploys the artifacts
5151
1. Monitors the deployed artifacts
52-
1. Cleans up deployed artifacts on exit (Ctrl+C)
52+
1. Cleans up deployed artifacts on exit (Ctrl+C)
5353

5454
{{< alert title="Note" >}}
55-
Skaffold also supports skipping stages if you want to.
55+
Skaffold also supports skipping stages if you want to.
5656
{{< /alert >}}
57-
57+
5858
What's more, the pluggable architecture is central to Skaffold's design, allowing you to use
5959
the tool you prefer in each stage. Also, Skaffold's `profiles` feature grants
60-
you the freedom to switch tools as you see fit depending on the context.
60+
you the freedom to switch tools as you see fit depending on the context.
6161

6262
For example, if you are coding on a local machine, you can configure Skaffold to build artifacts
6363
with local Docker daemon and deploy them to minikube
@@ -89,22 +89,22 @@ Skaffold supports the following tools:
8989

9090
{{% tab "TAG POLICIES" %}}
9191
* tag by git commit
92-
* tag by current date&time
92+
* tag by current date&time
9393
* tag by environment variables based template
9494
* tag by digest of the Docker image
9595
{{% /tab %}}
9696

9797
{{% tab "PUSH STRATEGIES" %}}
9898
* don't push - keep the image on the local daemon
99-
* push to registry
100-
{{% /tab %}}
99+
* push to registry
100+
{{% /tab %}}
101101
{{% /tabs %}}
102102

103103

104104
![architecture](/images/architecture.png)
105105

106106

107-
Besides the above steps, Skaffold also automatically manages the following utilities for you:
107+
Besides the above steps, Skaffold also automatically manages the following utilities for you:
108108

109109
* forward container ports to your local machine using `kubectl port-forward`
110110
* aggregate all the logs from the deployed pods

docs/content/en/docs/concepts/_index.md

+16-16
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@ Skaffold allows you to skip stages. If, for example, you run Kubernetes
6060
locally with [Minikube](https://kubernetes.io/docs/setup/minikube/), Skaffold
6161
will not push artifacts to a remote repository.
6262

63-
## Image repository handling
63+
## Image repository handling
6464

6565
Skaffold allows for automatically rewriting image names to your repository.
66-
This way you can grab a Skaffold project and just `skaffold run` it to deploy to your cluster.
67-
The way to achieve this is the `default-repo` functionality:
66+
This way you can grab a Skaffold project and just `skaffold run` it to deploy to your cluster.
67+
The way to achieve this is the `default-repo` functionality:
6868

6969
1. Via `default-repo` flag
7070

@@ -75,25 +75,25 @@ The way to achieve this is the `default-repo` functionality:
7575
1. Via `SKAFFOLD_DEFAULT_REPO` environment variable
7676

7777
```bash
78-
SKAFFOLD_DEFAULT_REPO=<myrepo> skaffold dev
78+
SKAFFOLD_DEFAULT_REPO=<myrepo> skaffold dev
7979
```
8080

81-
1. Via Skaffold's global config
81+
1. Via Skaffold's global config
8282
8383
```bash
8484
skaffold config set default-repo <myrepo>
8585
```
8686
87-
If Skaffold doesn't find `default-repo`, there is no automated image name rewriting.
87+
If Skaffold doesn't find `default-repo`, there is no automated image name rewriting.
8888

89-
The image name rewriting strategies are designed to be *conflict-free*:
89+
The image name rewriting strategies are designed to be *conflict-free*:
9090
the full image name is rewritten on top of the default-repo so similar image names don't collide in the base namespace (e.g.: repo1/example and repo2/example would collide in the target_namespace/example without this)
9191
92-
Automated image name rewriting strategies are determined based on the default-repo and the original image repository:
92+
Automated image name rewriting strategies are determined based on the default-repo and the original image repository:
9393
9494
* default-repo does not begin with gcr.io
9595
* **strategy**: escape & concat & truncate to 256
96-
96+
9797
```
9898
original image: gcr.io/k8s-skaffold/skaffold-example1
9999
default-repo: aws_account_id.dkr.ecr.region.amazonaws.com
@@ -103,21 +103,21 @@ Automated image name rewriting strategies are determined based on the default-re
103103
* default-repo begins with "gcr.io" (special case - as GCR allows for infinite deep image repo names)
104104
* **strategy**: concat unless prefix matches
105105
* **example1**: prefix doesn't match:
106-
106+
107107
```
108108
original image: gcr.io/k8s-skaffold/skaffold-example1
109109
default-repo: gcr.io/myproject/myimage
110110
rewritten image: gcr.io/myproject/myimage/gcr.io/k8s-skaffold/skaffold-example1
111111
```
112112
* **example2**: prefix matches:
113-
113+
114114
```
115115
original image: gcr.io/k8s-skaffold/skaffold-example1
116116
default-repo: gcr.io/k8s-skaffold
117117
rewritten image: gcr.io/k8s-skaffold/skaffold-example1
118118
```
119119
* **example3**: shared prefix:
120-
120+
121121
```
122122
original image: gcr.io/k8s-skaffold/skaffold-example1
123123
default-repo: gcr.io/k8s-skaffold/myimage
@@ -135,20 +135,20 @@ provides built-in support for the following tools:
135135

136136
* **Build**
137137
* Dockerfile locally, in-cluster with kaniko or using Google Cloud Build
138-
* Bazel locally
138+
* Bazel locally
139139
* Jib Maven and Jib Gradle locally or using Google Cloud Build
140140
* **Test**
141141
* [container-structure-test](https://github.com/GoogleContainerTools/container-structure-test)
142142
* **Tag**
143-
* Git tagger
143+
* Git tagger
144144
* Sha256 tagger
145-
* Env Template tagger
145+
* Env Template tagger
146146
* DateTime tagger
147147
* **Deploy**
148148
* Kubernetes Command-Line Interface (`kubectl`)
149149
* [Helm](https://helm.sh/)
150150
* [kustomize](https://github.com/kubernetes-sigs/kustomize)
151-
151+
152152
And you can combine the tools as you see fit in Skaffold. For experimental
153153
projects, you may want to use local Docker daemon for building artifacts, and
154154
deploy them to a Minikube local Kubernetes cluster with `kubectl`:

0 commit comments

Comments
 (0)