Skip to content

Commit a95c9f2

Browse files
authored
fixing formatting in 1.25.0 doc and updating install prereq to be go 1.19 (#6253)
Signed-off-by: Adam D. Cornett <adc@redhat.com> Signed-off-by: Adam D. Cornett <adc@redhat.com>
1 parent b38c7f8 commit a95c9f2

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

website/content/en/docs/installation/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ chmod +x operator-sdk_${OS}_${ARCH} && sudo mv operator-sdk_${OS}_${ARCH} /usr/l
8888
#### Prerequisites
8989

9090
- [git][git_tool]
91-
- [go][go_tool] version 1.18
91+
- [go][go_tool] version 1.19
9292
- Ensure that your `GOPROXY` is set to `"https://proxy.golang.org|direct"`
9393

9494
```sh

website/content/en/docs/upgrading-sdk-version/v1.25.0.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,19 @@ weight: 998975000
2525
PLATFORMS ?= linux/arm64,linux/amd64,linux/s390x,linux/ppc64le
2626
.PHONY: docker-buildx
2727
docker-buildx: test ## Build and push docker image for the manager for cross-platform support
28-
# copy existing Dockerfile and insert --platform=${BUILDPLATFORM} into Dockerfile.cross, and preserve the original Dockerfile
29-
sed -e '1 s/\(^FROM\)/FROM --platform=\$$\{BUILDPLATFORM\}/; t' -e ' 1,// s//FROM --platform=\$$\{BUILDPLATFORM\}/' Dockerfile > Dockerfile.cross
30-
- docker buildx create --name project-v3-builder
31-
docker buildx use project-v3-builder
32-
- docker buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross
33-
- docker buildx rm project-v3-builder
34-
rm Dockerfile.cross
28+
# copy existing Dockerfile and insert --platform=${BUILDPLATFORM} into Dockerfile.cross, and preserve the original Dockerfile
29+
sed -e '1 s/\(^FROM\)/FROM --platform=\$$\{BUILDPLATFORM\}/; t' -e ' 1,// s//FROM --platform=\$$\{BUILDPLATFORM\}/' Dockerfile > Dockerfile.cross
30+
- docker buildx create --name project-v3-builder
31+
docker buildx use project-v3-builder
32+
- docker buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross
33+
- docker buildx rm project-v3-builder
34+
rm Dockerfile.cross
3535
```
3636
3. (go/v3) Bump dependencies in go.mod file
3737

3838
```go
39+
go 1.19
40+
3941
github.com/onsi/ginkgo/v2 v2.1.4
4042
github.com/onsi/gomega v1.19.0
4143
github.com/prometheus/client_golang v1.12.2
@@ -52,7 +54,7 @@ _See [#6047](https://github.com/operator-framework/operator-sdk/pull/6047) for m
5254
In the project `Makefile` below the `docker-push` target add the new `docker-buildx`
5355
target.
5456

55-
```yaml
57+
```sh
5658
# PLATFORMS defines the target platforms for the manager image be build to provide support to multiple
5759
# architectures. (i.e. make docker-buildx IMG=myregistry/mypoperator:0.0.1). To use this option you need to:
5860
# - able to use docker buildx . More info: https://docs.docker.com/build/buildx/

0 commit comments

Comments
 (0)