Skip to content

Commit 7ce2255

Browse files
authored
Merge pull request #6 from movetokube/fix/packages
fix go package names and regenerate openapi after moving project to org
2 parents 4695e4e + 2ace92e commit 7ce2255

File tree

8 files changed

+63
-19
lines changed

8 files changed

+63
-19
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
gen:
44
operator-sdk generate k8s
55
build:
6-
operator-sdk build hitman99/postgres-operator
7-
docker push hitman99/postgres-operator
6+
operator-sdk build movetokube/postgres-operator
7+
docker push movetokube/postgres-operator

build/Dockerfile.dist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM golang:1.12.6-stretch
22

3-
COPY . /go/src/github.com/hitman99/postgres-operator
4-
WORKDIR /go/src/github.com/hitman99/postgres-operator/cmd/manager
3+
COPY . /go/src/github.com/movetokube/postgres-operator
4+
WORKDIR /go/src/github.com/movetokube/postgres-operator/cmd/manager
55

66
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o /usr/local/bin/postgres-operator
77

cmd/manager/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
1111
_ "k8s.io/client-go/plugin/pkg/client/auth"
1212

13-
"github.com/hitman99/postgres-operator/pkg/apis"
14-
"github.com/hitman99/postgres-operator/pkg/controller"
13+
"github.com/movetokube/postgres-operator/pkg/apis"
14+
"github.com/movetokube/postgres-operator/pkg/controller"
1515

1616
"github.com/operator-framework/operator-sdk/pkg/k8sutil"
1717
"github.com/operator-framework/operator-sdk/pkg/leader"

deploy/crds/db_v1alpha1_postgres_crd.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,24 @@ spec:
2626
metadata:
2727
type: object
2828
spec:
29+
properties:
30+
database:
31+
type: string
32+
secretName:
33+
type: string
34+
required:
35+
- database
36+
- secretName
2937
type: object
3038
status:
39+
properties:
40+
postgresRole:
41+
type: string
42+
succeeded:
43+
type: boolean
44+
required:
45+
- succeeded
46+
- postgresRole
3147
type: object
3248
version: v1alpha1
3349
versions:

pkg/apis/addtoscheme_db_v1alpha1.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package apis
22

33
import (
4-
"github.com/hitman99/postgres-operator/pkg/apis/db/v1alpha1"
4+
"github.com/movetokube/postgres-operator/pkg/apis/db/v1alpha1"
55
)
66

77
func init() {

pkg/apis/db/v1alpha1/zz_generated.openapi.go

Lines changed: 36 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/controller/add_postgres.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package controller
22

33
import (
4-
"github.com/hitman99/postgres-operator/pkg/controller/postgres"
4+
"github.com/movetokube/postgres-operator/pkg/controller/postgres"
55
)
66

77
func init() {

pkg/controller/postgres/postgres_controller.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
goerr "errors"
66
"fmt"
77
"github.com/go-logr/logr"
8-
dbv1alpha1 "github.com/hitman99/postgres-operator/pkg/apis/db/v1alpha1"
9-
"github.com/hitman99/postgres-operator/pkg/postgres"
10-
"github.com/hitman99/postgres-operator/pkg/utils"
8+
dbv1alpha1 "github.com/movetokube/postgres-operator/pkg/apis/db/v1alpha1"
9+
"github.com/movetokube/postgres-operator/pkg/postgres"
10+
"github.com/movetokube/postgres-operator/pkg/utils"
1111
"k8s.io/apimachinery/pkg/api/errors"
1212

1313
corev1 "k8s.io/api/core/v1"

0 commit comments

Comments
 (0)