Skip to content

OCPBUGS-44842: Set not-before/not-after annotations #776

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −1
Open

OCPBUGS-44842: Set not-before/not-after annotations #776

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
19 changes: 18 additions & 1 deletion pkg/controllers/webhookauthenticator/webhookauthenticator_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ package webhookauthenticator

import (
"context"
"crypto/tls"
"crypto/x509"
"encoding/base64"
"fmt"
"net"
Expand All @@ -28,6 +30,7 @@ import (
configv1client "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"
applyoperatorv1 "github.com/openshift/client-go/operator/applyconfigurations/operator/v1"
"github.com/openshift/library-go/pkg/controller/factory"
"github.com/openshift/library-go/pkg/operator/certrotation"
"github.com/openshift/library-go/pkg/operator/events"
"github.com/openshift/library-go/pkg/operator/resource/resourceapply"
"github.com/openshift/library-go/pkg/operator/status"
Expand Down Expand Up @@ -196,12 +199,26 @@ func (c *webhookAuthenticatorController) ensureKubeConfigSecret(ctx context.Cont

kubeconfigComplete := replacer.Replace(string(kubeconfigBytes))

pair, err := tls.X509KeyPair(cert, key)
if err != nil {
return nil, fmt.Errorf("invalid TLS keypair in authenticator secret: %w", err)
}
if len(pair.Certificate) == 0 {
return nil, fmt.Errorf("no certificate data found in authenticator secret")
}
parsedCert, err := x509.ParseCertificate(pair.Certificate[0])
if err != nil {
return nil, fmt.Errorf("failed to parse leaf certificate from authenticator secret: %w", err)
}

requiredSecret := &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Name: webhookSecretName,
Namespace: configNamespace,
Annotations: map[string]string{
annotations.OpenShiftComponent: "apiserver-auth",
annotations.OpenShiftComponent: "apiserver-auth",
certrotation.CertificateNotBeforeAnnotation: parsedCert.NotBefore.Format(time.RFC3339),
certrotation.CertificateNotAfterAnnotation: parsedCert.NotAfter.Format(time.RFC3339),
},
},
Data: map[string][]byte{
Expand Down