Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 31 additions & 31 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,41 +6,41 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: 1.19
- run: make test
- uses: actions/checkout@v4
- uses: actions/setup-go@v2
with:
go-version: 1.19
- run: make test

docker-image:
name: "Publish image on dockerhub"
needs:
- test
- test
runs-on: ubuntu-latest
if: github.event_name != 'pull_request'
steps:
- uses: actions/checkout@v2
- uses: docker/setup-buildx-action@v1
- uses: actions/cache@v2
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-
- uses: Surgo/docker-smart-tag-action@v1
id: smarttag
with:
docker_image: tsuru/acl-operator
default_branch: main
tag_with_sha: "true"
- uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}
- uses: docker/build-push-action@v2
with:
file: ./Dockerfile
push: true
tags: ${{ steps.smarttag.outputs.tag }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache
- uses: actions/checkout@v4
- uses: docker/setup-buildx-action@v1
- uses: actions/cache@v4
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-
- uses: Surgo/docker-smart-tag-action@v1
id: smarttag
with:
docker_image: tsuru/acl-operator
default_branch: main
tag_with_sha: "true"
- uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}
- uses: docker/build-push-action@v2
with:
file: ./Dockerfile
push: true
tags: ${{ steps.smarttag.outputs.tag }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
*.dll
*.so
*.dylib
./bin

# Test binary, built with `go test -c`
*.test
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM golang:1.19 as builder
FROM golang:1.19 AS builder

WORKDIR /workspace
# Copy the Go Modules manifests
Expand Down
14 changes: 12 additions & 2 deletions api/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file removed bin/controller-gen
Binary file not shown.
3 changes: 1 addition & 2 deletions clients/tsuruapi/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"fmt"
"net/http"

"github.com/pkg/errors"
"github.com/tsuru/tsuru/app"
)

Expand Down Expand Up @@ -59,7 +58,7 @@ func (c *client) AppInfo(ctx context.Context, appName string) (*app.App, error)
return nil, err
}
if appData.Pool == "" || appData.Name == "" {
return nil, errors.Errorf("empty data for app %q", appName)
return nil, fmt.Errorf("empty data for app %q", appName)
}

return &appData, nil
Expand Down
4 changes: 4 additions & 0 deletions config/crd/bases/extensions.tsuru.io_acldnsentries.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ spec:
spec:
description: ACLDNSEntrySpec defines the desired state of ACLDNSEntry
properties:
additionalIPs:
items:
type: string
type: array
host:
type: string
required:
Expand Down
2 changes: 2 additions & 0 deletions config/crd/bases/extensions.tsuru.io_acls.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ spec:
type: object
tsuruApp:
type: string
tsuruJob:
type: string
type: object
required:
- destinations
Expand Down
4 changes: 4 additions & 0 deletions config/crd/bases/extensions.tsuru.io_tsuruappaddresses.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ spec:
spec:
description: TsuruAppAddressSpec defines the desired state of TsuruAppAddress
properties:
additionalIPs:
items:
type: string
type: array
name:
type: string
type: object
Expand Down
Loading
Loading