Skip to content

Commit 0864aba

Browse files
stefanprodanstefanprodan
authored
Merge pull request #265 from fluxcd/pkg/runtime-v0.8.0
Update fluxcd/pkg/runtime to v0.8.0
2 parents 2dac836 + 207ed99 commit 0864aba

15 files changed

+63
-62
lines changed

‎api/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ module github.com/fluxcd/source-controller/api
33
go 1.15
44

55
require (
6-
github.com/fluxcd/pkg/apis/meta v0.6.0
7-
k8s.io/api v0.20.2
6+
github.com/fluxcd/pkg/apis/meta v0.7.0
7+
k8s.io/api v0.20.2 // indirect
88
k8s.io/apimachinery v0.20.2
99
sigs.k8s.io/controller-runtime v0.8.0
1010
)

‎api/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
8888
github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
8989
github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
9090
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
91-
github.com/fluxcd/pkg/apis/meta v0.6.0 h1:3ETc/Yz4qXGKLj+Iti6vKFwVE024WX+Jr+jIHlxj7zs=
92-
github.com/fluxcd/pkg/apis/meta v0.6.0/go.mod h1:yHuY8kyGHYz22I0jQzqMMGCcHViuzC/WPdo9Gisk8Po=
91+
github.com/fluxcd/pkg/apis/meta v0.7.0 h1:5e8gm4OLqjuKWdrOIY5DEEsjcwzyJFK8rCDesJ+V8IY=
92+
github.com/fluxcd/pkg/apis/meta v0.7.0/go.mod h1:yHuY8kyGHYz22I0jQzqMMGCcHViuzC/WPdo9Gisk8Po=
9393
github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
9494
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
9595
github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=

‎api/v1beta1/bucket_types.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package v1beta1
1818

1919
import (
2020
"github.com/fluxcd/pkg/apis/meta"
21-
corev1 "k8s.io/api/core/v1"
2221
apimeta "k8s.io/apimachinery/pkg/api/meta"
2322
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2423
)
@@ -55,7 +54,7 @@ type BucketSpec struct {
5554
// The name of the secret containing authentication credentials
5655
// for the Bucket.
5756
// +optional
58-
SecretRef *corev1.LocalObjectReference `json:"secretRef,omitempty"`
57+
SecretRef *meta.LocalObjectReference `json:"secretRef,omitempty"`
5958

6059
// The interval at which to check for bucket updates.
6160
// +required

‎api/v1beta1/gitrepository_types.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package v1beta1
1818

1919
import (
2020
"github.com/fluxcd/pkg/apis/meta"
21-
corev1 "k8s.io/api/core/v1"
2221
apimeta "k8s.io/apimachinery/pkg/api/meta"
2322
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2423
)
@@ -45,7 +44,7 @@ type GitRepositorySpec struct {
4544
// For SSH repositories the secret must contain identity, identity.pub and
4645
// known_hosts fields.
4746
// +optional
48-
SecretRef *corev1.LocalObjectReference `json:"secretRef,omitempty"`
47+
SecretRef *meta.LocalObjectReference `json:"secretRef,omitempty"`
4948

5049
// The interval at which to check for repository updates.
5150
// +required
@@ -110,7 +109,7 @@ type GitRepositoryVerification struct {
110109
Mode string `json:"mode"`
111110

112111
// The secret name containing the public keys of all trusted Git authors.
113-
SecretRef corev1.LocalObjectReference `json:"secretRef,omitempty"`
112+
SecretRef meta.LocalObjectReference `json:"secretRef,omitempty"`
114113
}
115114

116115
// GitRepositoryStatus defines the observed state of a Git repository.

‎api/v1beta1/helmrepository_types.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package v1beta1
1818

1919
import (
2020
"github.com/fluxcd/pkg/apis/meta"
21-
corev1 "k8s.io/api/core/v1"
2221
apimeta "k8s.io/apimachinery/pkg/api/meta"
2322
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2423
)
@@ -44,7 +43,7 @@ type HelmRepositorySpec struct {
4443
// For TLS the secret must contain a certFile and keyFile, and/or
4544
// caCert fields.
4645
// +optional
47-
SecretRef *corev1.LocalObjectReference `json:"secretRef,omitempty"`
46+
SecretRef *meta.LocalObjectReference `json:"secretRef,omitempty"`
4847

4948
// The interval at which to check the upstream for updates.
5049
// +required

‎api/v1beta1/zz_generated.deepcopy.go‎

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

‎config/crd/bases/source.toolkit.fluxcd.io_buckets.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,10 @@ spec:
8383
for the Bucket.
8484
properties:
8585
name:
86-
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
87-
TODO: Add other useful fields. apiVersion, kind, uid?'
86+
description: Name of the referent
8887
type: string
88+
required:
89+
- name
8990
type: object
9091
suspend:
9192
description: This flag tells the controller to suspend the reconciliation

‎config/crd/bases/source.toolkit.fluxcd.io_gitrepositories.yaml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,10 @@ spec:
9393
and known_hosts fields.
9494
properties:
9595
name:
96-
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
97-
TODO: Add other useful fields. apiVersion, kind, uid?'
96+
description: Name of the referent
9897
type: string
98+
required:
99+
- name
99100
type: object
100101
suspend:
101102
description: This flag tells the controller to suspend the reconciliation
@@ -125,9 +126,10 @@ spec:
125126
trusted Git authors.
126127
properties:
127128
name:
128-
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
129-
TODO: Add other useful fields. apiVersion, kind, uid?'
129+
description: Name of the referent
130130
type: string
131+
required:
132+
- name
131133
type: object
132134
required:
133135
- mode

‎config/crd/bases/source.toolkit.fluxcd.io_helmrepositories.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,10 @@ spec:
5959
certFile and keyFile, and/or caCert fields.
6060
properties:
6161
name:
62-
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
63-
TODO: Add other useful fields. apiVersion, kind, uid?'
62+
description: Name of the referent
6463
type: string
64+
required:
65+
- name
6566
type: object
6667
suspend:
6768
description: This flag tells the controller to suspend the reconciliation

‎controllers/helmchart_controller_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ var _ = Describe("HelmChartReconciler", func() {
314314
},
315315
Spec: sourcev1.HelmRepositorySpec{
316316
URL: helmServer.URL(),
317-
SecretRef: &corev1.LocalObjectReference{
317+
SecretRef: &meta.LocalObjectReference{
318318
Name: secretKey.Name,
319319
},
320320
Interval: metav1.Duration{Duration: pullInterval},
@@ -803,7 +803,7 @@ var _ = Describe("HelmChartReconciler", func() {
803803
},
804804
Spec: sourcev1.HelmRepositorySpec{
805805
URL: helmServer.URL(),
806-
SecretRef: &corev1.LocalObjectReference{
806+
SecretRef: &meta.LocalObjectReference{
807807
Name: secretKey.Name,
808808
},
809809
Interval: metav1.Duration{Duration: pullInterval},

0 commit comments

Comments
 (0)