Skip to content

Move ingress & filter TLS secret names into constants #7081

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

Merged
knative-prow merged 3 commits into from
Jul 7, 2023
Merged

Move ingress & filter TLS secret names into constants #7081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6732a4
Move TLS secret name into constant
creydr Jul 7, 2023
e194d62
Move constants to reconciler package
creydr Jul 7, 2023
377be6a
Move constants in separate packages
creydr Jul 7, 2023
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
6 changes: 5 additions & 1 deletion pkg/broker/filter/server_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ import (
secretinformer "knative.dev/pkg/injection/clients/namespacedkube/informers/core/v1/secret"
)

const (
tlsSecretName = "mt-broker-filter-server-tls" //nolint:gosec // This is not a hardcoded credential
)

func NewServerManager(ctx context.Context, logger *zap.Logger, cmw configmap.Watcher, httpPort, httpsPort int, handler *Handler) (*eventingtls.ServerManager, error) {
tlsConfig, err := getServerTLSConfig(ctx)
if err != nil {
Expand All @@ -45,7 +49,7 @@ func NewServerManager(ctx context.Context, logger *zap.Logger, cmw configmap.Wat
func getServerTLSConfig(ctx context.Context) (*tls.Config, error) {
secret := types.NamespacedName{
Namespace: "knative-eventing",
Name: "mt-broker-filter-server-tls",
Name: tlsSecretName,
}

serverTLSConfig := eventingtls.NewDefaultServerConfig()
Expand Down
6 changes: 5 additions & 1 deletion pkg/broker/ingress/server_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ import (
secretinformer "knative.dev/pkg/injection/clients/namespacedkube/informers/core/v1/secret"
)

const (
tlsSecretName = "mt-broker-ingress-server-tls" //nolint:gosec // This is not a hardcoded credential
)

func NewServerManager(ctx context.Context, logger *zap.Logger, cmw configmap.Watcher, httpPort, httpsPort int, handler *Handler) (*eventingtls.ServerManager, error) {
tlsConfig, err := getServerTLSConfig(ctx)
if err != nil {
Expand All @@ -45,7 +49,7 @@ func NewServerManager(ctx context.Context, logger *zap.Logger, cmw configmap.Wat
func getServerTLSConfig(ctx context.Context) (*tls.Config, error) {
secret := types.NamespacedName{
Namespace: "knative-eventing",
Name: "mt-broker-ingress-server-tls",
Name: tlsSecretName,
}

serverTLSConfig := eventingtls.NewDefaultServerConfig()
Expand Down
9 changes: 4 additions & 5 deletions pkg/reconciler/broker/broker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ import (
)

const (
brokerIngressTLSSecretName = "mt-broker-ingress-server-tls" //nolint:gosec // This is not a hardcoded credential
ingressServerTLSSecretName = "mt-broker-ingress-server-tls" //nolint:gosec // This is not a hardcoded credential
caCertsSecretKey = eventingtls.SecretCACert
)

Expand Down Expand Up @@ -402,14 +402,13 @@ func TriggerChannelLabels(brokerName string) map[string]string {
}

func (r *Reconciler) getCaCerts() (string, error) {
// Getting the secret called "mt-broker-ingress-server-tls" from system namespace
secret, err := r.secretLister.Secrets(system.Namespace()).Get(brokerIngressTLSSecretName)
secret, err := r.secretLister.Secrets(system.Namespace()).Get(ingressServerTLSSecretName)
if err != nil {
return "", fmt.Errorf("failed to get CA certs from %s/%s: %w", system.Namespace(), brokerIngressTLSSecretName, err)
return "", fmt.Errorf("failed to get CA certs from %s/%s: %w", system.Namespace(), ingressServerTLSSecretName, err)
}
caCerts, ok := secret.Data[caCertsSecretKey]
if !ok {
return "", fmt.Errorf("failed to get CA certs from %s/%s: missing %s key", system.Namespace(), brokerIngressTLSSecretName, caCertsSecretKey)
return "", fmt.Errorf("failed to get CA certs from %s/%s: missing %s key", system.Namespace(), ingressServerTLSSecretName, caCertsSecretKey)
}
return string(caCerts), nil
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/reconciler/broker/broker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -976,7 +976,7 @@ func makeTLSSecret() *corev1.Secret {
return &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Namespace: systemNS,
Name: brokerIngressTLSSecretName,
Name: ingressServerTLSSecretName,
},
Data: map[string][]byte{
"ca.crt": []byte(testCaCerts),
Expand Down
2 changes: 1 addition & 1 deletion pkg/reconciler/broker/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ func NewController(
Handler: controller.HandleAll(grCb),
})
secretInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{
FilterFunc: controller.FilterWithName(brokerIngressTLSSecretName),
FilterFunc: controller.FilterWithName(ingressServerTLSSecretName),
Handler: controller.HandleAll(grCb),
})

Expand Down
2 changes: 1 addition & 1 deletion pkg/reconciler/broker/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func TestNew(t *testing.T) {

secret := types.NamespacedName{
Namespace: system.Namespace(),
Name: brokerIngressTLSSecretName,
Name: ingressServerTLSSecretName,
}

_ = secretinformer.Get(ctx).Informer().GetStore().Add(&corev1.Secret{
Expand Down
15 changes: 7 additions & 8 deletions pkg/reconciler/broker/trigger/trigger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,10 @@ var brokerGVK = eventingv1.SchemeGroupVersion.WithKind("Broker")

const (
// Name of the corev1.Events emitted from the Trigger reconciliation process.
subscriptionDeleteFailed = "SubscriptionDeleteFailed"
subscriptionCreateFailed = "SubscriptionCreateFailed"
subscriptionGetFailed = "SubscriptionGetFailed"

brokerFilterTLSSecretName = "mt-broker-filter-server-tls" //nolint:gosec // This is not a hardcoded credential
subscriptionDeleteFailed = "SubscriptionDeleteFailed"
subscriptionCreateFailed = "SubscriptionCreateFailed"
subscriptionGetFailed = "SubscriptionGetFailed"
filterServerTLSSecretName = "mt-broker-filter-server-tls" //nolint:gosec // This is not a hardcoded credential
)

type Reconciler struct {
Expand Down Expand Up @@ -350,13 +349,13 @@ func getBrokerChannelRef(b *eventingv1.Broker) (*corev1.ObjectReference, error)
}

func (r *Reconciler) getCaCerts() (string, error) {
secret, err := r.secretLister.Secrets(system.Namespace()).Get(brokerFilterTLSSecretName)
secret, err := r.secretLister.Secrets(system.Namespace()).Get(filterServerTLSSecretName)
if err != nil {
return "", fmt.Errorf("failed to get CA certs from %s/%s: %w", system.Namespace(), brokerFilterTLSSecretName, err)
return "", fmt.Errorf("failed to get CA certs from %s/%s: %w", system.Namespace(), filterServerTLSSecretName, err)
}
caCerts, ok := secret.Data[eventingtls.SecretCACert]
if !ok {
return "", fmt.Errorf("failed to get CA certs from %s/%s: missing %s key", system.Namespace(), brokerFilterTLSSecretName, eventingtls.SecretCACert)
return "", fmt.Errorf("failed to get CA certs from %s/%s: missing %s key", system.Namespace(), filterServerTLSSecretName, eventingtls.SecretCACert)
}
return string(caCerts), nil
}
4 changes: 2 additions & 2 deletions pkg/reconciler/broker/trigger/trigger_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ func TestReconcile(t *testing.T) {
WithChannelAPIVersionAnnotation(triggerChannelAPIVersion),
WithChannelKindAnnotation(triggerChannelKind),
WithChannelNameAnnotation(triggerChannelName)),
NewSecret("mt-broker-filter-server-tls", systemNS, WithSecretData(map[string][]byte{
NewSecret(filterServerTLSSecretName, systemNS, WithSecretData(map[string][]byte{
"ca.crt": eventingtlstesting.CA,
})),
NewTrigger(triggerName, testNS, brokerName,
Expand Down Expand Up @@ -473,7 +473,7 @@ func TestReconcile(t *testing.T) {
WithChannelAPIVersionAnnotation(triggerChannelAPIVersion),
WithChannelKindAnnotation(triggerChannelKind),
WithChannelNameAnnotation(triggerChannelName)),
NewSecret("mt-broker-filter-server-tls", systemNS, WithSecretData(map[string][]byte{
NewSecret(filterServerTLSSecretName, systemNS, WithSecretData(map[string][]byte{
"ca.crt": eventingtlstesting.CA,
})),
NewTrigger(triggerName, testNS, brokerName,
Expand Down