File tree Expand file tree Collapse file tree 5 files changed +30
-5
lines changed
Expand file tree Collapse file tree 5 files changed +30
-5
lines changed Original file line number Diff line number Diff line change 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
Original file line number Diff line number Diff line change @@ -43,6 +43,7 @@ func (i InstanceSidecarConfiguration) GetCacheTTL() int {
4343type 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.
5962type 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
Original file line number Diff line number Diff 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
1516type cachedSecret struct {
Original file line number Diff line number Diff line change 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
33package client
Original file line number Diff line number Diff line change @@ -2,7 +2,6 @@ package instance
22
33import (
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
2424var scheme = runtime .NewScheme ()
You can’t perform that action at this time.
0 commit comments