Skip to content

Commit 49e85f5

Browse files
authored
Merge pull request #12 from gianlucam76/v0.26
Update libsveltos pin
2 parents e179531 + 294f3e4 commit 49e85f5

File tree

7 files changed

+255
-214
lines changed

7 files changed

+255
-214
lines changed

api/v1alpha1/zz_generated.deepcopy.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/crd/bases/extension.projectsveltos.io_jsonnetsources.yaml

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.12.0
6+
controller-gen.kubebuilder.io/version: v0.14.0
77
name: jsonnetsources.extension.projectsveltos.io
88
spec:
99
group: extension.projectsveltos.io
@@ -20,23 +20,30 @@ spec:
2020
description: JsonnetSource is the Schema for the jsonnetsources API
2121
properties:
2222
apiVersion:
23-
description: 'APIVersion defines the versioned schema of this representation
24-
of an object. Servers should convert recognized schemas to the latest
25-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
23+
description: |-
24+
APIVersion defines the versioned schema of this representation of an object.
25+
Servers should convert recognized schemas to the latest internal value, and
26+
may reject unrecognized values.
27+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2628
type: string
2729
kind:
28-
description: 'Kind is a string value representing the REST resource this
29-
object represents. Servers may infer this from the endpoint the client
30-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
30+
description: |-
31+
Kind is a string value representing the REST resource this object represents.
32+
Servers may infer this from the endpoint the client submits requests to.
33+
Cannot be updated.
34+
In CamelCase.
35+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3136
type: string
3237
metadata:
3338
type: object
3439
spec:
3540
description: JsonnetSourceSpec defines the desired state of JsonnetSource
3641
properties:
3742
kind:
38-
description: 'Kind of the resource. Supported kinds are: - flux GitRepository;OCIRepository;Bucket
39-
- ConfigMap/Secret (which will be mounted as volume)'
43+
description: |-
44+
Kind of the resource. Supported kinds are:
45+
- flux GitRepository;OCIRepository;Bucket
46+
- ConfigMap/Secret (which will be mounted as volume)
4047
enum:
4148
- GitRepository
4249
- OCIRepository
@@ -49,13 +56,15 @@ spec:
4956
minLength: 1
5057
type: string
5158
namespace:
52-
description: Namespace of the referenced resource. Namespace can be
53-
left empty. In such a case, namespace will be implicit set to cluster's
54-
namespace.
59+
description: |-
60+
Namespace of the referenced resource.
61+
Namespace can be left empty. In such a case, namespace will
62+
be implicit set to cluster's namespace.
5563
type: string
5664
path:
57-
description: Path to the jsonnet file. Defaults to 'None', which translates
58-
to the root path of the SourceRef.
65+
description: |-
66+
Path to the jsonnet file.
67+
Defaults to 'None', which translates to the root path of the SourceRef.
5968
type: string
6069
variables:
6170
additionalProperties:
@@ -74,8 +83,9 @@ spec:
7483
description: FailureMessage provides more information about the error.
7584
type: string
7685
resources:
77-
description: Resources contains the output of jsonnet, so the resources
78-
to be deployed
86+
description: |-
87+
Resources contains the output of jsonnet, so the
88+
resources to be deployed
7989
type: string
8090
type: object
8191
type: object

go.mod

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,27 @@ module github.com/gianlucam76/jsonnet-controller
22

33
go 1.21
44

5-
toolchain go1.21.5
6-
75
require (
86
github.com/TwiN/go-color v1.4.1
9-
github.com/fluxcd/pkg/http/fetch v0.6.0
10-
github.com/fluxcd/pkg/tar v0.3.0
11-
github.com/fluxcd/source-controller/api v1.1.2
7+
github.com/fluxcd/pkg/http/fetch v0.9.0
8+
github.com/fluxcd/pkg/tar v0.4.0
9+
github.com/fluxcd/source-controller/api v1.2.4
1210
github.com/ghodss/yaml v1.0.0
1311
github.com/go-logr/logr v1.4.1
1412
github.com/google/go-jsonnet v0.20.0
15-
github.com/onsi/ginkgo/v2 v2.15.0
16-
github.com/onsi/gomega v1.31.0
13+
github.com/onsi/ginkgo/v2 v2.16.0
14+
github.com/onsi/gomega v1.31.1
1715
github.com/pkg/errors v0.9.1
18-
github.com/projectsveltos/libsveltos v0.22.1-0.20240125122253-24c1c8a0b429
16+
github.com/projectsveltos/libsveltos v0.26.1-0.20240315101738-cf8cc0af064f
1917
github.com/spf13/pflag v1.0.5
2018
k8s.io/api v0.29.1
2119
k8s.io/apiextensions-apiserver v0.29.1
2220
k8s.io/apimachinery v0.29.1
2321
k8s.io/client-go v0.29.1
2422
k8s.io/component-base v0.29.1
25-
k8s.io/klog/v2 v2.120.0
26-
sigs.k8s.io/cluster-api v1.6.1
27-
sigs.k8s.io/controller-runtime v0.16.3
23+
k8s.io/klog/v2 v2.120.1
24+
sigs.k8s.io/cluster-api v1.6.3
25+
sigs.k8s.io/controller-runtime v0.17.2
2826
)
2927

3028
require (
@@ -35,9 +33,9 @@ require (
3533
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3634
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
3735
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
38-
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
36+
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
3937
github.com/fluxcd/pkg/apis/acl v0.1.0 // indirect
40-
github.com/fluxcd/pkg/apis/meta v1.1.2 // indirect
38+
github.com/fluxcd/pkg/apis/meta v1.3.0 // indirect
4139
github.com/fsnotify/fsnotify v1.7.0 // indirect
4240
github.com/go-openapi/jsonpointer v0.19.6 // indirect
4341
github.com/go-openapi/jsonreference v0.20.2 // indirect
@@ -53,35 +51,36 @@ require (
5351
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
5452
github.com/google/uuid v1.3.1 // indirect
5553
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
56-
github.com/hashicorp/go-retryablehttp v0.7.4 // indirect
54+
github.com/hashicorp/go-retryablehttp v0.7.5 // indirect
5755
github.com/imdario/mergo v0.3.13 // indirect
5856
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5957
github.com/josharian/intern v1.0.0 // indirect
6058
github.com/json-iterator/go v1.1.12 // indirect
59+
github.com/klauspost/cpuid/v2 v2.2.6 // indirect
6160
github.com/mailru/easyjson v0.7.7 // indirect
62-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
61+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
6362
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6463
github.com/modern-go/reflect2 v1.0.2 // indirect
6564
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6665
github.com/opencontainers/go-digest v1.0.0 // indirect
67-
github.com/opencontainers/go-digest/blake3 v0.0.0-20230801144141-122dc6384261 // indirect
68-
github.com/prometheus/client_golang v1.17.0 // indirect
69-
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
70-
github.com/prometheus/common v0.44.0 // indirect
71-
github.com/prometheus/procfs v0.11.1 // indirect
66+
github.com/opencontainers/go-digest/blake3 v0.0.0-20231025023718-d50d2fec9c98 // indirect
67+
github.com/prometheus/client_golang v1.18.0 // indirect
68+
github.com/prometheus/client_model v0.5.0 // indirect
69+
github.com/prometheus/common v0.45.0 // indirect
70+
github.com/prometheus/procfs v0.12.0 // indirect
7271
github.com/spf13/cobra v1.8.0 // indirect
73-
github.com/zeebo/blake3 v0.1.1 // indirect
72+
github.com/zeebo/blake3 v0.2.3 // indirect
7473
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
75-
golang.org/x/net v0.19.0 // indirect
74+
golang.org/x/net v0.20.0 // indirect
7675
golang.org/x/oauth2 v0.14.0 // indirect
77-
golang.org/x/sys v0.15.0 // indirect
78-
golang.org/x/term v0.15.0 // indirect
76+
golang.org/x/sys v0.16.0 // indirect
77+
golang.org/x/term v0.16.0 // indirect
7978
golang.org/x/text v0.14.0 // indirect
8079
golang.org/x/time v0.3.0 // indirect
81-
golang.org/x/tools v0.16.1 // indirect
80+
golang.org/x/tools v0.17.0 // indirect
8281
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
8382
google.golang.org/appengine v1.6.7 // indirect
84-
google.golang.org/protobuf v1.31.0 // indirect
83+
google.golang.org/protobuf v1.33.0 // indirect
8584
gopkg.in/inf.v0 v0.9.1 // indirect
8685
gopkg.in/yaml.v2 v2.4.0 // indirect
8786
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)