Skip to content

Commit 8844d7b

Browse files
committed
Restart on configuration change
1 parent 5b58a6d commit 8844d7b

File tree

129 files changed

+2967
-805
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+2967
-805
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ test: manifests generate fmt vet envtest ## Run tests.
117117

118118
.PHONY: integration-test
119119
integration-test:
120-
go test ./e2e/... -tags=integration
120+
go test ./e2e/... -tags=integration -timeout 20m
121121

122122
##@ Build
123123

api/v1alpha1/ctlog_types.go

+6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package v1alpha1
22

33
import (
4+
v1 "k8s.io/api/core/v1"
45
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
56
)
67

@@ -35,6 +36,11 @@ type CTlogSpec struct {
3536

3637
// CTlogStatus defines the observed state of CTlog component
3738
type CTlogStatus struct {
39+
ServerConfigRef *v1.LocalObjectReference `json:"serverConfigRef,omitempty"`
40+
PrivateKeyRef *SecretKeySelector `json:"privateKeyRef,omitempty"`
41+
PrivateKeyPasswordRef *SecretKeySelector `json:"privateKeyPasswordRef,omitempty"`
42+
PublicKeyRef *SecretKeySelector `json:"publicKeyRef,omitempty"`
43+
RootCertificates []SecretKeySelector `json:"rootCertificates,omitempty"`
3844
// +listType=map
3945
// +listMapKey=type
4046
// +patchStrategy=merge

api/v1alpha1/fulcio_types.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package v1alpha1
22

33
import (
4+
v1 "k8s.io/api/core/v1"
45
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
56
)
67

@@ -77,7 +78,9 @@ type OIDCIssuer struct {
7778

7879
// FulcioStatus defines the observed state of Fulcio
7980
type FulcioStatus struct {
80-
Url string `json:"url,omitempty"`
81+
ServerConfigRef *v1.LocalObjectReference `json:"serverConfigRef,omitempty"`
82+
Certificate FulcioCert `json:"certificate,omitempty"`
83+
Url string `json:"url,omitempty"`
8184
// +listType=map
8285
// +listMapKey=type
8386
// +patchStrategy=merge

api/v1alpha1/rekor_types.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package v1alpha1
22

33
import (
4+
v1 "k8s.io/api/core/v1"
45
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
56
)
67

@@ -54,8 +55,11 @@ type BackFillRedis struct {
5455

5556
// RekorStatus defines the observed state of Rekor
5657
type RekorStatus struct {
57-
Url string `json:"url,omitempty"`
58-
RekorSearchUIUrl string `json:"rekorSearchUIUrl,omitempty"`
58+
ServerConfigRef *v1.LocalObjectReference `json:"serverConfigRef,omitempty"`
59+
Signer RekorSigner `json:"signer,omitempty"`
60+
PvcName string `json:"pvcName,omitempty"`
61+
Url string `json:"url,omitempty"`
62+
RekorSearchUIUrl string `json:"rekorSearchUIUrl,omitempty"`
5963
// +listType=map
6064
// +listMapKey=type
6165
// +patchStrategy=merge

api/v1alpha1/trillian_types.go

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ type TrillianDB struct {
3939

4040
// TrillianStatus defines the observed state of Trillian
4141
type TrillianStatus struct {
42+
Db TrillianDB `json:"database,omitempty"`
4243
// +listType=map
4344
// +listMapKey=type
4445
// +patchStrategy=merge

api/v1alpha1/tuf_types.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ type TufKey struct {
2626

2727
// TufStatus defines the observed state of Tuf
2828
type TufStatus struct {
29-
Url string `json:"url,omitempty"`
29+
Keys []TufKey `json:"keys,omitempty"`
30+
Url string `json:"url,omitempty"`
3031
// +listType=map
3132
// +listMapKey=type
3233
// +patchStrategy=merge

api/v1alpha1/zz_generated.deepcopy.go

+54-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bundle/manifests/rhtas-operator.clusterserviceversion.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ metadata:
176176
}
177177
]
178178
capabilities: Basic Install
179-
createdAt: "2024-02-15T11:34:50Z"
179+
createdAt: "2024-02-21T12:48:28Z"
180180
operators.operatorframework.io/builder: operator-sdk-v1.32.0
181181
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
182182
name: rhtas-operator.v0.0.1
@@ -354,6 +354,7 @@ spec:
354354
verbs:
355355
- create
356356
- delete
357+
- deletecollection
357358
- get
358359
- list
359360
- patch

bundle/manifests/rhtas.redhat.com_ctlogs.yaml

+72
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,78 @@ spec:
186186
x-kubernetes-list-map-keys:
187187
- type
188188
x-kubernetes-list-type: map
189+
privateKeyPasswordRef:
190+
description: SecretKeySelector selects a key of a Secret.
191+
properties:
192+
key:
193+
description: The key of the secret to select from. Must be a
194+
valid secret key.
195+
type: string
196+
name:
197+
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
198+
TODO: Add other useful fields. apiVersion, kind, uid?'
199+
type: string
200+
required:
201+
- key
202+
type: object
203+
x-kubernetes-map-type: atomic
204+
privateKeyRef:
205+
description: SecretKeySelector selects a key of a Secret.
206+
properties:
207+
key:
208+
description: The key of the secret to select from. Must be a
209+
valid secret key.
210+
type: string
211+
name:
212+
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
213+
TODO: Add other useful fields. apiVersion, kind, uid?'
214+
type: string
215+
required:
216+
- key
217+
type: object
218+
x-kubernetes-map-type: atomic
219+
publicKeyRef:
220+
description: SecretKeySelector selects a key of a Secret.
221+
properties:
222+
key:
223+
description: The key of the secret to select from. Must be a
224+
valid secret key.
225+
type: string
226+
name:
227+
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
228+
TODO: Add other useful fields. apiVersion, kind, uid?'
229+
type: string
230+
required:
231+
- key
232+
type: object
233+
x-kubernetes-map-type: atomic
234+
rootCertificates:
235+
items:
236+
description: SecretKeySelector selects a key of a Secret.
237+
properties:
238+
key:
239+
description: The key of the secret to select from. Must be
240+
a valid secret key.
241+
type: string
242+
name:
243+
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
244+
TODO: Add other useful fields. apiVersion, kind, uid?'
245+
type: string
246+
required:
247+
- key
248+
type: object
249+
x-kubernetes-map-type: atomic
250+
type: array
251+
serverConfigRef:
252+
description: LocalObjectReference contains enough information to let
253+
you locate the referenced object inside the same namespace.
254+
properties:
255+
name:
256+
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
257+
TODO: Add other useful fields. apiVersion, kind, uid?'
258+
type: string
259+
type: object
260+
x-kubernetes-map-type: atomic
189261
type: object
190262
type: object
191263
served: true

bundle/manifests/rhtas.redhat.com_fulcios.yaml

+65
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,61 @@ spec:
203203
status:
204204
description: FulcioStatus defines the observed state of Fulcio
205205
properties:
206+
certificate:
207+
description: FulcioCert defines fields for system-generated certificate
208+
properties:
209+
caRef:
210+
description: Reference to CA certificate
211+
properties:
212+
key:
213+
description: The key of the secret to select from. Must be
214+
a valid secret key.
215+
type: string
216+
name:
217+
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
218+
TODO: Add other useful fields. apiVersion, kind, uid?'
219+
type: string
220+
required:
221+
- key
222+
type: object
223+
x-kubernetes-map-type: atomic
224+
commonName:
225+
type: string
226+
organizationEmail:
227+
type: string
228+
organizationName:
229+
type: string
230+
privateKeyPasswordRef:
231+
description: Reference to password to encrypt CA private key
232+
properties:
233+
key:
234+
description: The key of the secret to select from. Must be
235+
a valid secret key.
236+
type: string
237+
name:
238+
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
239+
TODO: Add other useful fields. apiVersion, kind, uid?'
240+
type: string
241+
required:
242+
- key
243+
type: object
244+
x-kubernetes-map-type: atomic
245+
privateKeyRef:
246+
description: Reference to CA private key
247+
properties:
248+
key:
249+
description: The key of the secret to select from. Must be
250+
a valid secret key.
251+
type: string
252+
name:
253+
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
254+
TODO: Add other useful fields. apiVersion, kind, uid?'
255+
type: string
256+
required:
257+
- key
258+
type: object
259+
x-kubernetes-map-type: atomic
260+
type: object
206261
conditions:
207262
items:
208263
description: "Condition contains details for one aspect of the current
@@ -274,6 +329,16 @@ spec:
274329
x-kubernetes-list-map-keys:
275330
- type
276331
x-kubernetes-list-type: map
332+
serverConfigRef:
333+
description: LocalObjectReference contains enough information to let
334+
you locate the referenced object inside the same namespace.
335+
properties:
336+
name:
337+
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
338+
TODO: Add other useful fields. apiVersion, kind, uid?'
339+
type: string
340+
type: object
341+
x-kubernetes-map-type: atomic
277342
url:
278343
type: string
279344
type: object

0 commit comments

Comments
 (0)