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.

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

fix: add missing githubcredentials plural occurences #208

Merged
merged 1 commit into from
Nov 18, 2024
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
2 changes: 1 addition & 1 deletion Tiltfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ k8s_resource(
'runners.garm-operator.mercedes-benz.com:customresourcedefinition',
'repositories.garm-operator.mercedes-benz.com:customresourcedefinition',
'garmserverconfigs.garm-operator.mercedes-benz.com:customresourcedefinition',
'githubcredential.garm-operator.mercedes-benz.com:customresourcedefinition',
'githubcredentials.garm-operator.mercedes-benz.com:customresourcedefinition',
'githubendpoints.garm-operator.mercedes-benz.com:customresourcedefinition',
'garm-operator-controller-manager:serviceaccount',
'garm-operator-leader-election-role:role',
Expand Down
2 changes: 1 addition & 1 deletion api/v1beta1/garmserverconfig_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ type GarmServerConfigStatus struct {
}

//+kubebuilder:object:root=true
//+kubebuilder:resource:path=garmserverconfigs,scope=Namespaced,categories=garm,shortName=server
//+kubebuilder:resource:path=garmserverconfigs,scope=Namespaced,categories=garm
//+kubebuilder:subresource:status
//+kubebuilder:storageversion
//+kubebuilder:printcolumn:name="ID",type="string",JSONPath=".status.controllerId",description="Controller ID"
Expand Down
2 changes: 1 addition & 1 deletion api/v1beta1/githubcredentials_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ type GitHubCredentialStatus struct {
}

//+kubebuilder:object:root=true
//+kubebuilder:resource:path=githubcredentials,scope=Namespaced,categories=garm,shortName=creds
//+kubebuilder:resource:path=githubcredentials,scope=Namespaced,categories=garm
//+kubebuilder:subresource:status
//+kubebuilder:storageversion
//+kubebuilder:printcolumn:name="ID",type="string",JSONPath=".status.id",description="Credentials ID"
Expand Down
2 changes: 1 addition & 1 deletion api/v1beta1/githubendpoint_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ type GitHubEndpointStatus struct {
}

//+kubebuilder:object:root=true
//+kubebuilder:resource:path=githubendpoints,scope=Namespaced,categories=garm,shortName=gep
//+kubebuilder:resource:path=githubendpoints,scope=Namespaced,categories=garm
//+kubebuilder:subresource:status
//+kubebuilder:storageversion
//+kubebuilder:printcolumn:name="URL",type="string",JSONPath=".spec.apiBaseUrl",description="API Base URL"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ spec:
kind: GarmServerConfig
listKind: GarmServerConfigList
plural: garmserverconfigs
shortNames:
- server
singular: garmserverconfig
scope: Namespaced
versions:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ spec:
kind: GitHubCredential
listKind: GitHubCredentialList
plural: githubcredentials
shortNames:
- creds
singular: githubcredential
scope: Namespaced
versions:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ spec:
kind: GitHubEndpoint
listKind: GitHubEndpointList
plural: githubendpoints
shortNames:
- gep
singular: githubendpoint
scope: Namespaced
versions:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ resources:
- bases/garm-operator.mercedes-benz.com_runners.yaml
- bases/garm-operator.mercedes-benz.com_garmserverconfigs.yaml
- bases/garm-operator.mercedes-benz.com_githubendpoints.yaml
- bases/garm-operator.mercedes-benz.com_githubcredential.yaml
- bases/garm-operator.mercedes-benz.com_githubcredentials.yaml
#+kubebuilder:scaffold:crdkustomizeresource

patches:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/patches/cainjection_in_githubcredentials.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: CERTIFICATE_NAMESPACE/CERTIFICATE_NAME
name: githubcredential.garm-operator.mercedes-benz.com
name: githubcredentials.garm-operator.mercedes-benz.com
2 changes: 1 addition & 1 deletion config/crd/patches/webhook_in_githubcredentials.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: githubcredential.garm-operator.mercedes-benz.com
name: githubcredentials.garm-operator.mercedes-benz.com
spec:
conversion:
strategy: Webhook
Expand Down
4 changes: 2 additions & 2 deletions config/rbac/githubcredentials_editor_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ rules:
- apiGroups:
- garm-operator.mercedes-benz.com
resources:
- githubcredential
- githubcredentials
verbs:
- create
- delete
Expand All @@ -26,6 +26,6 @@ rules:
- apiGroups:
- garm-operator.mercedes-benz.com
resources:
- githubcredential/status
- githubcredentials/status
verbs:
- get
4 changes: 2 additions & 2 deletions config/rbac/githubcredentials_viewer_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ rules:
- apiGroups:
- garm-operator.mercedes-benz.com
resources:
- githubcredential
- githubcredentials
verbs:
- get
- list
- watch
- apiGroups:
- garm-operator.mercedes-benz.com
resources:
- githubcredential/status
- githubcredentials/status
verbs:
- get