Skip to content

Commit 961bee7

Browse files
committed
docs: minor changes
Signed-off-by: Francesco Canovai <[email protected]>
1 parent cd10e3e commit 961bee7

File tree

5 files changed

+30
-5
lines changed

5 files changed

+30
-5
lines changed

api/v1/doc.go

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/*
2+
Copyright The CloudNativePG Contributors
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
// Package v1 contains API Schema definitions for the barmancloud v1 API group
18+
// +kubebuilder:object:generate=true
19+
// +groupName=barmancloud.cnpg.io
20+
package v1

api/v1/objectstore_types.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ func (i InstanceSidecarConfiguration) GetCacheTTL() int {
4343
type ObjectStoreSpec struct {
4444
Configuration barmanapi.BarmanObjectStoreConfiguration `json:"configuration"`
4545

46+
// +optional
4647
InstanceSidecarConfiguration InstanceSidecarConfiguration `json:"instanceSidecarConfiguration,omitempty"`
4748
}
4849

@@ -54,13 +55,16 @@ type ObjectStoreStatus struct {
5455

5556
// +kubebuilder:object:root=true
5657
// +kubebuilder:subresource:status
58+
// +genclient
59+
// +kubebuilder:storageversion
5760

5861
// ObjectStore is the Schema for the objectstores API.
5962
type ObjectStore struct {
6063
metav1.TypeMeta `json:",inline"`
61-
metav1.ObjectMeta `json:"metadata,omitempty"`
64+
metav1.ObjectMeta `json:"metadata"`
6265

63-
Spec ObjectStoreSpec `json:"spec,omitempty"`
66+
Spec ObjectStoreSpec `json:"spec"`
67+
// +optional
6468
Status ObjectStoreStatus `json:"status,omitempty"`
6569
}
6670

internal/cnpgi/instance/internal/client/client.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ import (
77
"time"
88

99
"github.com/cloudnative-pg/machinery/pkg/log"
10-
v1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1"
1110
corev1 "k8s.io/api/core/v1"
1211
"sigs.k8s.io/controller-runtime/pkg/client"
12+
13+
v1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1"
1314
)
1415

1516
type cachedSecret struct {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
// Package client provides an extended client that is capable of caching multiple secrets without relying on
1+
// Package client provides an extended client that is capable of caching multiple secrets without relying on
22
// informers
33
package client

internal/cnpgi/instance/manager.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package instance
22

33
import (
44
"context"
5-
extendedclient "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/instance/internal/client"
65
"os"
76
"path"
87

@@ -19,6 +18,7 @@ import (
1918
"sigs.k8s.io/controller-runtime/pkg/log"
2019

2120
barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1"
21+
extendedclient "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/instance/internal/client"
2222
)
2323

2424
var scheme = runtime.NewScheme()

0 commit comments

Comments
 (0)