Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing the master branch build #84

Merged
merged 1 commit into from
Mar 23, 2021
Merged

Fixing the master branch build #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ jobs:
# uses: docker/build-push-action@9379083e426e2e84abb80c8c091f5cdeb7d3fd7a
uses: docker/build-push-action@v2.3.0
with:
tags: sorenmat/k8s-rds:latest,sorenmat/k8s-rds:${{ github.GITHUB_RUN_NUMBER }}
tags: sorenmat/k8s-rds:latest,sorenmat/k8s-rds:${{ github.run_number }}

2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ tools:
test:
$(GO) test ./... -v
lint:
$(ENV) golangci-lint
$(ENV) golangci-lint run
build:
$(GO) build -o bin/$(NAME)

Expand Down
4 changes: 2 additions & 2 deletions kube/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"

"github.com/pkg/errors"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/client-go/kubernetes"
Expand All @@ -20,7 +20,7 @@ func (k *Kube) createServiceObj(s *v1.Service, namespace string, hostname string
var ports []v1.ServicePort

ports = append(ports, v1.ServicePort{
Name: fmt.Sprintf("pgsql"),
Name: "pgsql",
Port: int32(5432),
TargetPort: intstr.IntOrString{IntVal: int32(5432)},
})
Expand Down
3 changes: 2 additions & 1 deletion local/local_provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ func TestUpdateDatabase(t *testing.T) {
assert.NoError(t, err)
assert.NotEmpty(t, host)
assert.Equal(t, 4, len(kc.Fake.Actions()))
host, err = l.CreateDatabase(db)
_, err = l.CreateDatabase(db)
assert.NoError(t, err)
assert.Equal(t, 8, len(kc.Fake.Actions()))

sequence := []struct {
Expand Down
2 changes: 1 addition & 1 deletion local/local_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func (k *Local) createServiceObj(s *v1.Service, namespace string, hostname strin
var ports []v1.ServicePort

ports = append(ports, v1.ServicePort{
Name: fmt.Sprintf("pgsql"),
Name: "pgsql",
Port: int32(5432),
TargetPort: intstr.IntOrString{IntVal: int32(5432)},
})
Expand Down
2 changes: 1 addition & 1 deletion rds/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func (k *RDS) createServiceObj(s *v1.Service, namespace string, hostname string,
var ports []v1.ServicePort

ports = append(ports, v1.ServicePort{
Name: fmt.Sprintf("pgsql"),
Name: "pgsql",
Port: int32(5432),
TargetPort: intstr.IntOrString{IntVal: int32(5432)},
})
Expand Down