Skip to content

Commit 52b8f9d

Browse files
author
Kumar Gaurav Sharma
committed
Update go templates to use runtime/pkg and runtime/apis as per split repo
1 parent d45d710 commit 52b8f9d

File tree

9 files changed

+24
-23
lines changed

9 files changed

+24
-23
lines changed

templates/apis/crd.go.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
{{ end }}
1010

1111
{{- end }}
12-
ackv1alpha1 "github.com/aws/aws-controllers-k8s/apis/core/v1alpha1"
12+
ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1"
1313
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1414
)
1515

templates/cmd/controller/main.go.tpl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ package main
55
import (
66
"os"
77

8-
ackcfg "github.com/aws/aws-controllers-k8s/pkg/config"
9-
ackrt "github.com/aws/aws-controllers-k8s/pkg/runtime"
8+
ackcfg "github.com/aws-controllers-k8s/runtime/pkg/config"
9+
ackrt "github.com/aws-controllers-k8s/runtime/pkg/runtime"
1010
flag "github.com/spf13/pflag"
1111
"k8s.io/apimachinery/pkg/runtime"
1212
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
@@ -69,6 +69,7 @@ func main() {
6969
)
7070
sc := ackrt.NewServiceController(
7171
awsServiceAlias, awsServiceAPIGroup,
72+
ackrt.VersionInfo{}, // TODO: populate version info
7273
).WithLogger(
7374
ctrlrt.Log,
7475
).WithResourceManagerFactories(

templates/pkg/resource/descriptor.go.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
package {{ .CRD.Names.Snake }}
44

55
import (
6-
acktypes "github.com/aws/aws-controllers-k8s/pkg/types"
7-
ackcompare "github.com/aws/aws-controllers-k8s/pkg/compare"
6+
acktypes "github.com/aws-controllers-k8s/runtime/pkg/types"
7+
ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare"
88
"github.com/google/go-cmp/cmp"
99
"github.com/google/go-cmp/cmp/cmpopts"
1010
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

templates/pkg/resource/identifiers.go.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
package {{ .CRD.Names.Snake }}
44

55
import (
6-
ackv1alpha1 "github.com/aws/aws-controllers-k8s/apis/core/v1alpha1"
6+
ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1"
77
)
88

99
// resourceIdentifiers implements the

templates/pkg/resource/manager.go.tpl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ package {{ .CRD.Names.Snake }}
55
import (
66
"context"
77
"fmt"
8-
ackerr "github.com/aws/aws-controllers-k8s/pkg/errors"
8+
ackerr "github.com/aws-controllers-k8s/runtime/pkg/errors"
99
corev1 "k8s.io/api/core/v1"
1010

11-
ackv1alpha1 "github.com/aws/aws-controllers-k8s/apis/core/v1alpha1"
12-
ackcfg "github.com/aws/aws-controllers-k8s/pkg/config"
13-
ackcompare "github.com/aws/aws-controllers-k8s/pkg/compare"
14-
ackmetrics "github.com/aws/aws-controllers-k8s/pkg/metrics"
15-
acktypes "github.com/aws/aws-controllers-k8s/pkg/types"
11+
ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1"
12+
ackcfg "github.com/aws-controllers-k8s/runtime/pkg/config"
13+
ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare"
14+
ackmetrics "github.com/aws-controllers-k8s/runtime/pkg/metrics"
15+
acktypes "github.com/aws-controllers-k8s/runtime/pkg/types"
1616
"github.com/aws/aws-sdk-go/aws/session"
1717
"github.com/go-logr/logr"
1818

templates/pkg/resource/manager_factory.go.tpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import (
66
"fmt"
77
"sync"
88

9-
ackv1alpha1 "github.com/aws/aws-controllers-k8s/apis/core/v1alpha1"
10-
ackcfg "github.com/aws/aws-controllers-k8s/pkg/config"
11-
ackmetrics "github.com/aws/aws-controllers-k8s/pkg/metrics"
12-
acktypes "github.com/aws/aws-controllers-k8s/pkg/types"
9+
ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1"
10+
ackcfg "github.com/aws-controllers-k8s/runtime/pkg/config"
11+
ackmetrics "github.com/aws-controllers-k8s/runtime/pkg/metrics"
12+
acktypes "github.com/aws-controllers-k8s/runtime/pkg/types"
1313
"github.com/aws/aws-sdk-go/aws/session"
1414
"github.com/go-logr/logr"
1515

templates/pkg/resource/registry.go.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
package resource
44

55
import (
6-
ackrt "github.com/aws/aws-controllers-k8s/pkg/runtime"
7-
acktypes "github.com/aws/aws-controllers-k8s/pkg/types"
6+
ackrt "github.com/aws-controllers-k8s/runtime/pkg/runtime"
7+
acktypes "github.com/aws-controllers-k8s/runtime/pkg/types"
88
)
99

1010
var (

templates/pkg/resource/resource.go.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
package {{ .CRD.Names.Snake }}
44

55
import (
6-
ackv1alpha1 "github.com/aws/aws-controllers-k8s/apis/core/v1alpha1"
7-
acktypes "github.com/aws/aws-controllers-k8s/pkg/types"
6+
ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1"
7+
acktypes "github.com/aws-controllers-k8s/runtime/pkg/types"
88
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
99
k8srt "k8s.io/apimachinery/pkg/runtime"
1010

templates/pkg/resource/sdk.go.tpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"context"
77
"strings"
88

9-
ackv1alpha1 "github.com/aws/aws-controllers-k8s/apis/core/v1alpha1"
10-
ackcompare "github.com/aws/aws-controllers-k8s/pkg/compare"
11-
ackerr "github.com/aws/aws-controllers-k8s/pkg/errors"
9+
ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1"
10+
ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare"
11+
ackerr "github.com/aws-controllers-k8s/runtime/pkg/errors"
1212
"github.com/aws/aws-sdk-go/aws"
1313
svcsdk "github.com/aws/aws-sdk-go/service/{{ .ServiceIDClean }}"
1414
corev1 "k8s.io/api/core/v1"

0 commit comments

Comments
 (0)