Skip to content

Rename GitopsTemplate to GitOpsTemplate #836

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

Merged
merged 2 commits into from
May 26, 2022
Merged

Rename GitopsTemplate to GitOpsTemplate #836

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50dcd38
Renamed GitopsTemplate to GitOpsTemplate
Skarlso May 26, 2022
b210d93
Merge branch 'main' into fix-gitops-template-name
Skarlso May 26, 2022
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
10 changes: 5 additions & 5 deletions charts/mccp/crds/clustertemplates.weave.works_gitopstemplates.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ metadata:
spec:
group: clustertemplates.weave.works
names:
kind: GitopsTemplate
listKind: GitopsTemplateList
kind: GitOpsTemplate
listKind: GitOpsTemplateList
plural: gitopstemplates
singular: gitopstemplate
scope: Namespaced
versions:
- name: v1alpha1
schema:
openAPIV3Schema:
description: GitopsTemplate is the Schema for the GitopsTemplates API
description: GitOpsTemplate is the Schema for the GitOpsTemplates API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
Expand All @@ -34,7 +34,7 @@ spec:
metadata:
type: object
spec:
description: GitopsTemplateSpec defines the desired state of GitopsTemplate
description: GitOpsTemplateSpec defines the desired state of GitOpsTemplate
properties:
description:
type: string
Expand Down Expand Up @@ -64,7 +64,7 @@ spec:
type: array
type: object
status:
description: GitopsTemplateStatus defines the observed state of GitopsTemplate
description: GitOpsTemplateStatus defines the observed state of GitOpsTemplate
type: object
type: object
served: true
Expand Down
2 changes: 1 addition & 1 deletion cmd/clusters-service/api/gitopstemplate/v1alpha1/gitops_template_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/weaveworks/weave-gitops-enterprise/cmd/clusters-service/api/templates"
)

const Kind = "GitopsTemplate"
const Kind = "GitOpsTemplate"

//+kubebuilder:object:root=true

Expand Down
10 changes: 5 additions & 5 deletions cmd/clusters-service/config/crd/bases/clustertemplates.weave.works_gitopstemplates.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ metadata:
spec:
group: clustertemplates.weave.works
names:
kind: GitopsTemplate
listKind: GitopsTemplateList
kind: GitOpsTemplate
listKind: GitOpsTemplateList
plural: gitopstemplates
singular: gitopstemplate
scope: Namespaced
versions:
- name: v1alpha1
schema:
openAPIV3Schema:
description: GitopsTemplate is the Schema for the GitopsTemplates API
description: GitOpsTemplate is the Schema for the GitOpsTemplates API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
Expand All @@ -34,7 +34,7 @@ spec:
metadata:
type: object
spec:
description: GitopsTemplateSpec defines the desired state of GitopsTemplate
description: GitOpsTemplateSpec defines the desired state of GitOpsTemplate
properties:
description:
type: string
Expand Down Expand Up @@ -64,7 +64,7 @@ spec:
type: array
type: object
status:
description: GitopsTemplateStatus defines the observed state of GitopsTemplate
description: GitOpsTemplateStatus defines the observed state of GitOpsTemplate
type: object
type: object
served: true
Expand Down
2 changes: 1 addition & 1 deletion cmd/clusters-service/config/samples/gitops-template-terraform.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: clustertemplates.weave.works/v1alpha1
kind: GitopsTemplate
kind: GitOpsTemplate
metadata:
name: sample-wge-tf-controller-template
namespace: default
Expand Down
2 changes: 2 additions & 0 deletions cmd/clusters-service/pkg/server/common_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"github.com/weaveworks/weave-gitops/pkg/kube/kubefakes"

pacv1 "github.com/weaveworks/policy-agent/api/v1"

capiv1 "github.com/weaveworks/weave-gitops-enterprise/cmd/clusters-service/api/capi/v1alpha1"
gapiv1 "github.com/weaveworks/weave-gitops-enterprise/cmd/clusters-service/api/gitopstemplate/v1alpha1"
apitemplates "github.com/weaveworks/weave-gitops-enterprise/cmd/clusters-service/api/templates"
Expand All @@ -27,6 +28,7 @@ import (
"github.com/weaveworks/weave-gitops-enterprise/cmd/clusters-service/pkg/templates"

gitopsv1alpha1 "github.com/weaveworks/cluster-controller/api/v1alpha1"

"github.com/weaveworks/weave-gitops-enterprise/cmd/clusters-service/pkg/clusters"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/clusters-service/pkg/templates/parse_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ func TestParseFileResourceTemplate(t *testing.T) {
want := &gapiv1.GitOpsTemplate{
Template: templates.Template{
TypeMeta: metav1.TypeMeta{
Kind: "GitopsTemplate",
Kind: "GitOpsTemplate",
APIVersion: "clustertemplates.weave.works/v1alpha1",
},
ObjectMeta: metav1.ObjectMeta{
Expand Down
2 changes: 1 addition & 1 deletion cmd/clusters-service/pkg/templates/templates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ func (lib *CRDLibrary) List(ctx context.Context, templateKind string) (map[strin
result[ct.ObjectMeta.Name] = &capiTemplateList.Items[i].Template
}
case gapiv1.Kind:
lib.Log.Info("Querying namespace for GitopsTemplate resources", "namespace", lib.CAPINamespace)
lib.Log.Info("Querying namespace for GitOpsTemplate resources", "namespace", lib.CAPINamespace)
list := gapiv1.GitOpsTemplateList{}
err = cl.List(ctx, &list, client.InNamespace(lib.CAPINamespace))
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion cmd/clusters-service/pkg/templates/testdata/bad_template_tfcontroller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: capi.weave.works/v1alpha1
kind: GitopsTemplate
kind: GitOpsTemplate
metadata:
name: tf-template2
spec:
Expand Down
2 changes: 1 addition & 1 deletion cmd/clusters-service/pkg/templates/testdata/cluster-template-2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: clustertemplates.weave.works/v1alpha1
kind: GitopsTemplate
kind: GitOpsTemplate
metadata:
name: tf-controller-2
namespace: default
Expand Down
2 changes: 1 addition & 1 deletion cmd/clusters-service/pkg/templates/testdata/cluster-template-multiple.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: clustertemplates.weave.works/v1alpha1
kind: GitopsTemplate
kind: GitOpsTemplate
metadata:
name: sample-wge-tf-controller-template
namespace: default
Expand Down
2 changes: 1 addition & 1 deletion cmd/clusters-service/pkg/templates/testdata/cluster-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: clustertemplates.weave.works/v1alpha1
kind: GitopsTemplate
kind: GitOpsTemplate
metadata:
name: sample-wge-tf-controller-template
namespace: default
Expand Down