docs: minor changes

Signed-off-by: Francesco Canovai <francesco.canovai@enterprisedb.com>
This commit is contained in:
Francesco Canovai 2024-11-13 15:04:25 +01:00 committed by Marco Nenciarini
parent 7165fe9652
commit 60da36c3c6
No known key found for this signature in database
GPG Key ID: 589F03F01BA55038
5 changed files with 30 additions and 5 deletions

20
api/v1/doc.go Normal file
View File

@ -0,0 +1,20 @@
/*
Copyright The CloudNativePG Contributors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
// Package v1 contains API Schema definitions for the barmancloud v1 API group
// +kubebuilder:object:generate=true
// +groupName=barmancloud.cnpg.io
package v1

View File

@ -43,6 +43,7 @@ func (i InstanceSidecarConfiguration) GetCacheTTL() int {
type ObjectStoreSpec struct { type ObjectStoreSpec struct {
Configuration barmanapi.BarmanObjectStoreConfiguration `json:"configuration"` Configuration barmanapi.BarmanObjectStoreConfiguration `json:"configuration"`
// +optional
InstanceSidecarConfiguration InstanceSidecarConfiguration `json:"instanceSidecarConfiguration,omitempty"` InstanceSidecarConfiguration InstanceSidecarConfiguration `json:"instanceSidecarConfiguration,omitempty"`
} }
@ -54,13 +55,16 @@ type ObjectStoreStatus struct {
// +kubebuilder:object:root=true // +kubebuilder:object:root=true
// +kubebuilder:subresource:status // +kubebuilder:subresource:status
// +genclient
// +kubebuilder:storageversion
// ObjectStore is the Schema for the objectstores API. // ObjectStore is the Schema for the objectstores API.
type ObjectStore struct { type ObjectStore struct {
metav1.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"` metav1.ObjectMeta `json:"metadata"`
Spec ObjectStoreSpec `json:"spec,omitempty"` Spec ObjectStoreSpec `json:"spec"`
// +optional
Status ObjectStoreStatus `json:"status,omitempty"` Status ObjectStoreStatus `json:"status,omitempty"`
} }

View File

@ -7,9 +7,10 @@ import (
"time" "time"
"github.com/cloudnative-pg/machinery/pkg/log" "github.com/cloudnative-pg/machinery/pkg/log"
v1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
"sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client"
v1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1"
) )
type cachedSecret struct { type cachedSecret struct {

View File

@ -1,3 +1,3 @@
// Package client provides an extended client that is capable of caching multiple secrets without relying on // Package client provides an extended client that is capable of caching multiple secrets without relying on
// informers // informers
package client package client

View File

@ -2,7 +2,6 @@ package instance
import ( import (
"context" "context"
extendedclient "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/instance/internal/client"
"os" "os"
"path" "path"
@ -19,6 +18,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log"
barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1" barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1"
extendedclient "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/instance/internal/client"
) )
var scheme = runtime.NewScheme() var scheme = runtime.NewScheme()