Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restart on configuration change #200

Merged
merged 1 commit into from
Feb 23, 2024
Merged

Restart on configuration change #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ test: manifests generate fmt vet envtest ## Run tests.

.PHONY: integration-test
integration-test:
go test ./e2e/... -tags=integration
go test ./e2e/... -tags=integration -timeout 20m

##@ Build

Expand Down
6 changes: 6 additions & 0 deletions api/v1alpha1/ctlog_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package v1alpha1

import (
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down Expand Up @@ -35,6 +36,11 @@ type CTlogSpec struct {

// CTlogStatus defines the observed state of CTlog component
type CTlogStatus struct {
ServerConfigRef *v1.LocalObjectReference `json:"serverConfigRef,omitempty"`
PrivateKeyRef *SecretKeySelector `json:"privateKeyRef,omitempty"`
PrivateKeyPasswordRef *SecretKeySelector `json:"privateKeyPasswordRef,omitempty"`
PublicKeyRef *SecretKeySelector `json:"publicKeyRef,omitempty"`
RootCertificates []SecretKeySelector `json:"rootCertificates,omitempty"`
// +listType=map
// +listMapKey=type
// +patchStrategy=merge
Expand Down
5 changes: 4 additions & 1 deletion api/v1alpha1/fulcio_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package v1alpha1

import (
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down Expand Up @@ -77,7 +78,9 @@ type OIDCIssuer struct {

// FulcioStatus defines the observed state of Fulcio
type FulcioStatus struct {
Url string `json:"url,omitempty"`
ServerConfigRef *v1.LocalObjectReference `json:"serverConfigRef,omitempty"`
Certificate FulcioCert `json:"certificate,omitempty"`
Url string `json:"url,omitempty"`
// +listType=map
// +listMapKey=type
// +patchStrategy=merge
Expand Down
8 changes: 6 additions & 2 deletions api/v1alpha1/rekor_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package v1alpha1

import (
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down Expand Up @@ -54,8 +55,11 @@ type BackFillRedis struct {

// RekorStatus defines the observed state of Rekor
type RekorStatus struct {
Url string `json:"url,omitempty"`
RekorSearchUIUrl string `json:"rekorSearchUIUrl,omitempty"`
ServerConfigRef *v1.LocalObjectReference `json:"serverConfigRef,omitempty"`
Signer RekorSigner `json:"signer,omitempty"`
PvcName string `json:"pvcName,omitempty"`
Url string `json:"url,omitempty"`
RekorSearchUIUrl string `json:"rekorSearchUIUrl,omitempty"`
// +listType=map
// +listMapKey=type
// +patchStrategy=merge
Expand Down
1 change: 1 addition & 0 deletions api/v1alpha1/trillian_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ type TrillianDB struct {

// TrillianStatus defines the observed state of Trillian
type TrillianStatus struct {
Db TrillianDB `json:"database,omitempty"`
// +listType=map
// +listMapKey=type
// +patchStrategy=merge
Expand Down
3 changes: 2 additions & 1 deletion api/v1alpha1/tuf_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ type TufKey struct {

// TufStatus defines the observed state of Tuf
type TufStatus struct {
Url string `json:"url,omitempty"`
Keys []TufKey `json:"keys,omitempty"`
Url string `json:"url,omitempty"`
// +listType=map
// +listMapKey=type
// +patchStrategy=merge
Expand Down
63 changes: 54 additions & 9 deletions api/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion bundle/manifests/rhtas-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ metadata:
}
]
capabilities: Basic Install
createdAt: "2024-02-15T11:34:50Z"
createdAt: "2024-02-22T09:00:47Z"
operators.operatorframework.io/builder: operator-sdk-v1.32.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
name: rhtas-operator.v0.0.1
Expand Down Expand Up @@ -354,6 +354,7 @@ spec:
verbs:
- create
- delete
- deletecollection
- get
- list
- patch
Expand Down
72 changes: 72 additions & 0 deletions bundle/manifests/rhtas.redhat.com_ctlogs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,78 @@ spec:
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
privateKeyPasswordRef:
description: SecretKeySelector selects a key of a Secret.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
type: string
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind, uid?'
type: string
required:
- key
type: object
x-kubernetes-map-type: atomic
privateKeyRef:
description: SecretKeySelector selects a key of a Secret.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
type: string
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind, uid?'
type: string
required:
- key
type: object
x-kubernetes-map-type: atomic
publicKeyRef:
description: SecretKeySelector selects a key of a Secret.
properties:
key:
description: The key of the secret to select from. Must be a
valid secret key.
type: string
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind, uid?'
type: string
required:
- key
type: object
x-kubernetes-map-type: atomic
rootCertificates:
items:
description: SecretKeySelector selects a key of a Secret.
properties:
key:
description: The key of the secret to select from. Must be
a valid secret key.
type: string
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind, uid?'
type: string
required:
- key
type: object
x-kubernetes-map-type: atomic
type: array
serverConfigRef:
description: LocalObjectReference contains enough information to let
you locate the referenced object inside the same namespace.
properties:
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind, uid?'
type: string
type: object
x-kubernetes-map-type: atomic
type: object
type: object
served: true
Expand Down
65 changes: 65 additions & 0 deletions bundle/manifests/rhtas.redhat.com_fulcios.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,61 @@ spec:
status:
description: FulcioStatus defines the observed state of Fulcio
properties:
certificate:
description: FulcioCert defines fields for system-generated certificate
properties:
caRef:
description: Reference to CA certificate
properties:
key:
description: The key of the secret to select from. Must be
a valid secret key.
type: string
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind, uid?'
type: string
required:
- key
type: object
x-kubernetes-map-type: atomic
commonName:
type: string
organizationEmail:
type: string
organizationName:
type: string
privateKeyPasswordRef:
description: Reference to password to encrypt CA private key
properties:
key:
description: The key of the secret to select from. Must be
a valid secret key.
type: string
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind, uid?'
type: string
required:
- key
type: object
x-kubernetes-map-type: atomic
privateKeyRef:
description: Reference to CA private key
properties:
key:
description: The key of the secret to select from. Must be
a valid secret key.
type: string
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind, uid?'
type: string
required:
- key
type: object
x-kubernetes-map-type: atomic
type: object
conditions:
items:
description: "Condition contains details for one aspect of the current
Expand Down Expand Up @@ -274,6 +329,16 @@ spec:
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
serverConfigRef:
description: LocalObjectReference contains enough information to let
you locate the referenced object inside the same namespace.
properties:
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind, uid?'
type: string
type: object
x-kubernetes-map-type: atomic
url:
type: string
type: object
Expand Down
Loading
Loading