Skip to content

Commit 03cb33f

Browse files
committed
wip
Signed-off-by: Joe Lanford <[email protected]>
1 parent eb0312c commit 03cb33f

17 files changed

+496
-382
lines changed

.github/workflows/e2e.yaml

Lines changed: 0 additions & 32 deletions
This file was deleted.

.github/workflows/release.yaml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,15 @@ jobs:
2626
with:
2727
go-version-file: "go.mod"
2828

29+
- uses: actions/cache@v3
30+
with:
31+
path: |
32+
~/.cache/go-build
33+
~/go/pkg/mod
34+
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
35+
restore-keys: |
36+
${{ runner.os }}-go-
37+
2938
- name: Docker Login
3039
if: ${{ github.event_name != 'pull_request' }}
3140
uses: docker/login-action@v1
@@ -39,25 +48,23 @@ jobs:
3948
if [[ $GITHUB_REF == refs/tags/* ]]; then
4049
# Release tags.
4150
echo IMAGE_TAG="${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
42-
echo GORELEASER_ARGS="--rm-dist" >> $GITHUB_ENV
51+
echo GORELEASER_ARGS="--clean" >> $GITHUB_ENV
4352
echo DISABLE_RELEASE_PIPELINE=false >> $GITHUB_ENV
4453
elif [[ $GITHUB_REF == refs/heads/* ]]; then
4554
# Branch build.
4655
echo IMAGE_TAG="$(echo "${GITHUB_REF#refs/heads/}" | sed -r 's|/+|-|g')" >> $GITHUB_ENV
47-
echo GORELEASER_ARGS="--rm-dist --skip-validate" >> $GITHUB_ENV
56+
echo GORELEASER_ARGS="--clean --skip-validate" >> $GITHUB_ENV
4857
elif [[ $GITHUB_REF == refs/pull/* ]]; then
4958
# PR build.
5059
echo IMAGE_TAG="pr-$(echo "${GITHUB_REF}" | sed -E 's|refs/pull/([^/]+)/?.*|\1|')" >> $GITHUB_ENV
5160
else
5261
echo IMAGE_TAG="$(git describe --tags --always)" >> $GITHUB_ENV
5362
fi
5463
55-
- name: Generate the operator-controller release manifests
56-
if: ${{ startsWith(github.ref, 'refs/tags/v') }}
57-
run: |
58-
make quickstart VERSION=${GITHUB_REF#refs/tags/}
64+
- name: Install Task
65+
run: go install github.com/go-task/task/v3/cmd/task@latest
5966

6067
- name: Run goreleaser
61-
run: make release
68+
run: task release
6269
env:
6370
GITHUB_TOKEN: ${{ github.token }}

.github/workflows/test.yaml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: test
2+
3+
on:
4+
workflow_dispatch:
5+
pull_request:
6+
push:
7+
branches:
8+
- main
9+
10+
jobs:
11+
test:
12+
runs-on: ubuntu-latest
13+
strategy:
14+
matrix:
15+
test: [ sanity, unit, e2e ]
16+
steps:
17+
- uses: actions/checkout@v3
18+
19+
- uses: actions/setup-go@v3
20+
with:
21+
go-version-file: go.mod
22+
23+
- uses: actions/cache@v3
24+
with:
25+
path: |
26+
~/.cache/go-build
27+
~/go/pkg/mod
28+
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
29+
restore-keys: |
30+
${{ runner.os }}-go-
31+
32+
- name: Install Task
33+
run: go install github.com/go-task/task/v3/cmd/task@latest
34+
35+
- name: Run ${{matrix.test}} test
36+
run: |
37+
task test:${{matrix.test}}

.github/workflows/unit-test.yaml

Lines changed: 0 additions & 32 deletions
This file was deleted.

.gitignore

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,21 @@
55
*.dll
66
*.so
77
*.dylib
8-
bin/*
9-
testbin/*
10-
Dockerfile.cross
8+
**/bin/*
119

1210
# Test binary, build with `go test -c`
1311
*.test
1412

1513
# Output of the go coverage tool, specifically when used with LiteIDE
16-
*.out
14+
cover.out
1715

1816
# Release output
19-
dist/**
20-
.goreleaser.yml
21-
operator-controller.yaml
22-
23-
# Kubernetes Generated files - skip generated files, except for vendored files
24-
25-
!vendor/**/zz_generated.*
17+
/dist/**
18+
/install.sh
19+
/operator-controller.yaml
2620

2721
# editor and IDE paraphernalia
2822
.idea
2923
*.swp
3024
*.swo
3125
*~
32-
33-
# TODO dfranz remove this line and the bin folder when tools binaries are moved to their own folder
34-
!bin/.dockerignore

.goreleaser.template.yml

Lines changed: 0 additions & 50 deletions
This file was deleted.

.goreleaser.yml

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
env:
2+
- GOPROXY=https://proxy.golang.org|direct
3+
- GO111MODULE=on
4+
- CGO_ENABLED=0
5+
before:
6+
hooks:
7+
- go mod tidy
8+
- go mod download
9+
builds:
10+
- id: operator-controller
11+
main: ./
12+
binary: bin/manager
13+
tags: upstream
14+
goos:
15+
- linux
16+
goarch:
17+
- amd64
18+
- arm64
19+
- ppc64le
20+
- s390x
21+
ldflags:
22+
- -X main.Version={{ .Version }}
23+
dockers:
24+
- image_templates:
25+
- "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-amd64"
26+
dockerfile: Dockerfile
27+
goos: linux
28+
goarch: amd64
29+
- image_templates:
30+
- "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-arm64"
31+
dockerfile: Dockerfile
32+
goos: linux
33+
goarch: arm64
34+
- image_templates:
35+
- "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-ppc64le"
36+
dockerfile: Dockerfile
37+
goos: linux
38+
goarch: ppc64le
39+
- image_templates:
40+
- "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-s390x"
41+
dockerfile: Dockerfile
42+
goos: linux
43+
goarch: s390x
44+
docker_manifests:
45+
- name_template: "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}"
46+
image_templates:
47+
- "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-amd64"
48+
- "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-arm64"
49+
- "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-ppc64le"
50+
- "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-s390x"
51+
checksum:
52+
name_template: 'checksums.txt'
53+
snapshot:
54+
name_template: "{{ incpatch .Version }}-next"
55+
changelog:
56+
use: github-native
57+
skip: '{{ ne .Env.ENABLE_RELEASE_PIPELINE "true" }}'
58+
release:
59+
disable: '{{ ne .Env.ENABLE_RELEASE_PIPELINE "true" }}'
60+
extra_files:
61+
- glob: 'install.sh'
62+
- glob: 'operator-controller.yaml'
63+
header: |
64+
## Installation
65+
66+
```bash
67+
curl -sSL https://github.com/operator-framework/operator-controller/releases/download/{{ .Env.IMAGE_TAG }}/install.sh | bash
68+
```

0 commit comments

Comments
 (0)