Skip to content

Commit e896122

Browse files
Update nginx wordpress for beta (#2308)
1 parent 8879682 commit e896122

File tree

7 files changed

+19
-19
lines changed

7 files changed

+19
-19
lines changed

package-examples/nginx/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ spec:
2828
spec:
2929
containers:
3030
- name: nginx
31-
image: "nginx:1.14.2"
31+
image: "nginx:1.16.1"
3232
ports:
3333
- protocol: TCP
3434
containerPort: 80

package-examples/wordpress/deployment/volume.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ metadata:
2020
spec:
2121
resources:
2222
requests:
23-
storage: 2Gi
23+
storage: 3Gi
2424
accessModes:
2525
- ReadWriteOnce

site/book/01-getting-started/02-quickstart.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ package of configuration using the underlying Git version control system.
99
First, let's fetch the _kpt package_ from Git to your local filesystem:
1010

1111
```shell
12-
$ kpt pkg get https://github.com/GoogleContainerTools/kpt/package-examples/nginx@v0.4
12+
$ kpt pkg get https://github.com/GoogleContainerTools/kpt/package-examples/nginx@v0.7
1313
```
1414

1515
Subsequent commands are run from the `nginx` directory:
@@ -155,10 +155,10 @@ First, commit your local changes:
155155
$ git add .; git commit -m "My customizations"
156156
```
157157

158-
Then update to version `v0.5`:
158+
Then update to version `v0.8`:
159159

160160
```shell
161-
$ kpt pkg update @v0.5
161+
$ kpt pkg update @v0.8
162162
```
163163

164164
This merges the upstream changes with your local changes using a schema-aware

site/book/02-concepts/01-packages.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ a _subpackage_.
1111
Let's take a look at the wordpress package as an example:
1212

1313
```shell
14-
$ kpt pkg get https://github.com/GoogleContainerTools/kpt.git/package-examples/wordpress@v0.5
14+
$ kpt pkg get https://github.com/GoogleContainerTools/kpt.git/package-examples/wordpress@v0.7
1515
```
1616

1717
View the package hierarchy using the `tree` command:

site/book/03-packages/01-getting-a-package.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ committing them to a Git repository. Consumers fork the package to use it.
44
Let's revisit the Wordpress example:
55

66
```shell
7-
$ kpt pkg get https://github.com/GoogleContainerTools/kpt.git/package-examples/wordpress@v0.5
7+
$ kpt pkg get https://github.com/GoogleContainerTools/kpt.git/package-examples/wordpress@v0.7
88
```
99

1010
A package in a Git repo can be fetched by specifying a branch, tag, or commit
11-
SHA. In this case, we are specifying tag `v0.5`.
11+
SHA. In this case, we are specifying tag `v0.7`.
1212

1313
?> Refer to the [get command reference][get-doc] for usage.
1414

@@ -26,15 +26,15 @@ upstream:
2626
git:
2727
repo: https://github.com/GoogleContainerTools/kpt
2828
directory: /package-examples/wordpress
29-
ref: v0.5
29+
ref: v0.7
3030
updateStrategy: resource-merge
3131
upstreamLock:
3232
type: git
3333
git:
3434
repo: https://github.com/GoogleContainerTools/kpt
3535
directory: /package-examples/wordpress
36-
ref: package-examples/wordpress/v0.5
37-
commit: 4af5f509f33ab00ac99b1c3d146f8d1a4f4d3d0e
36+
ref: package-examples/wordpress/v0.7
37+
commit: cbd342d350b88677e522bf0d9faa0675edb8bbc1
3838
info:
3939
emails:
4040
@@ -101,7 +101,7 @@ For example, the following fetches the packages to a directory named
101101
`mywordpress`:
102102

103103
```shell
104-
$ kpt pkg get https://github.com/GoogleContainerTools/kpt.git/package-examples/wordpress@v0.5 mywordpress
104+
$ kpt pkg get https://github.com/GoogleContainerTools/kpt.git/package-examples/wordpress@v0.7 mywordpress
105105
```
106106

107107
The _name of a package_ is given by its directory name. Since the Kptfile is a

site/book/03-packages/05-updating-a-package.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ $ git add .; git commit -m "My changes"
2020

2121
## Update the package
2222

23-
For example, you can update to version `v0.6` of the `wordpress` package:
23+
For example, you can update to version `v0.8` of the `wordpress` package:
2424

2525
```shell
26-
$ kpt pkg update wordpress@v0.6
26+
$ kpt pkg update wordpress@v0.8
2727
```
2828

2929
This is a porcelain for manually updating the `upstream` section in the
@@ -35,8 +35,8 @@ upstream:
3535
git:
3636
repo: https://github.com/GoogleContainerTools/kpt
3737
directory: /package-examples/wordpress
38-
# Change this from v0.5 to v0.6
39-
ref: v0.6
38+
# Change this from v0.7 to v0.8
39+
ref: v0.8
4040
updateStrategy: resource-merge
4141
```
4242
@@ -47,7 +47,7 @@ $ kpt pkg update wordpress
4747
```
4848

4949
The `update` command updates the local `wordpress` package and the dependent
50-
`mysql` package to the upstream version `v0.6` by doing a 3-way merge between:
50+
`mysql` package to the upstream version `v0.8` by doing a 3-way merge between:
5151

5252
1. Original upstream commit
5353
2. New upstream commit
@@ -64,7 +64,7 @@ resource using OpenAPI schema.
6464
Once you have successfully updated the package, commit the changes:
6565

6666
```shell
67-
$ git add .; git commit -m "Updated wordpress to v0.6"
67+
$ git add .; git commit -m "Updated wordpress to v0.8"
6868
```
6969

7070
[update-doc]: /reference/cli/pkg/update/

site/book/05-developing-functions/02-developing-in-Go.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ $ go build -o my-fn .
7070
Fetch the wordpress package:
7171

7272
```shell
73-
$ kpt pkg get https://github.com/GoogleContainerTools/kpt.git/package-examples/wordpress@v0.5
73+
$ kpt pkg get https://github.com/GoogleContainerTools/kpt.git/package-examples/wordpress@v0.7
7474
```
7575

7676
Test it by running the function imperatively:

0 commit comments

Comments
 (0)