Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions Containerfile.operator
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ COPY --from=builder \
/opt/app-root/src/bin/hcp \
/opt/app-root/src/bin/hypershift-operator \
/opt/app-root/src/bin/control-plane-operator \
/opt/app-root/src/bin/control-plane-pki-operator \
/usr/bin/

RUN cd /usr/bin && \
Expand Down
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ COPY --from=builder /hypershift/bin/hypershift \
/hypershift/bin/hcp \
/hypershift/bin/hypershift-operator \
/hypershift/bin/control-plane-operator \
/hypershift/bin/control-plane-pki-operator \
Comment thread
stevekuznetsov marked this conversation as resolved.
Resolved
/usr/bin/

RUN cd /usr/bin && \
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile.control-plane
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ WORKDIR /hypershift

COPY . .

RUN make control-plane-operator
RUN make control-plane-operator control-plane-pki-operator

FROM registry.ci.openshift.org/ocp/4.15:base
COPY --from=builder /hypershift/bin/control-plane-operator /usr/bin/control-plane-operator
COPY --from=builder /hypershift/bin/control-plane-pki-operator /usr/bin/control-plane-pki-operator

ENTRYPOINT /usr/bin/control-plane-operator

Expand Down
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ all: build e2e

pre-commit: all verify test

build: hypershift-operator control-plane-operator hypershift product-cli
build: hypershift-operator control-plane-operator control-plane-pki-operator hypershift product-cli

.PHONY: update
update: deps api api-docs app-sre-saas-template clients
Expand Down Expand Up @@ -75,6 +75,10 @@ hypershift-operator:
control-plane-operator:
$(GO_BUILD_RECIPE) -o $(OUT_DIR)/control-plane-operator ./control-plane-operator

.PHONY: control-plane-pki-operator
Comment thread
stevekuznetsov marked this conversation as resolved.
Resolved
control-plane-pki-operator:
$(GO_BUILD_RECIPE) -o $(OUT_DIR)/control-plane-pki-operator ./control-plane-pki-operator

.PHONY: hypershift
hypershift:
$(GO_BUILD_RECIPE) -o $(OUT_DIR)/hypershift .
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ import (

"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/openshift/hypershift/control-plane-operator/controllers/hostedcontrolplane/pkioperator"
pkimanifests "github.com/openshift/hypershift/control-plane-pki-operator/manifests"
"k8s.io/apimachinery/pkg/runtime"

awssdk "github.com/aws/aws-sdk-go/aws"
Expand Down Expand Up @@ -153,6 +155,9 @@ type HostedControlPlaneReconciler struct {
// SetDefaultSecurityContext is used to configure Security Context for containers
SetDefaultSecurityContext bool

// CertRotationScale determines how quickly we rotate certificates - should only be set faster in testing
CertRotationScale time.Duration

Log logr.Logger
ReleaseProvider releaseinfo.ProviderWithOpenShiftImageRegistryOverrides
createOrUpdate func(hcp *hyperv1.HostedControlPlane) upsert.CreateOrUpdateFN
Expand Down Expand Up @@ -1091,6 +1096,12 @@ func (r *HostedControlPlaneReconciler) reconcile(ctx context.Context, hostedCont
return fmt.Errorf("failed to reconcile hosted cluster config operator: %w", err)
}

// Reconcile control plane pki operator
r.Log.Info("Reconciling Control Plane PKI Operator")
if err := r.reconcileControlPlanePKIOperator(ctx, hostedControlPlane, releaseImageProvider, createOrUpdate, openShiftTrustedCABundleConfigMapForCPOExists, r.CertRotationScale); err != nil {
return fmt.Errorf("failed to reconcile control plane pki operator: %w", err)
}

// Reconcile cloud controller manager
r.Log.Info("Reconciling Cloud Controller Manager")
if err := r.reconcileCloudControllerManager(ctx, hostedControlPlane, releaseImageProvider, createOrUpdate); err != nil {
Expand Down Expand Up @@ -1848,7 +1859,12 @@ func (r *HostedControlPlaneReconciler) reconcilePKI(ctx context.Context, hcp *hy
return fmt.Errorf("failed to reconcile kas server secret: %w", err)
}

if err := r.setupKASClientSigners(ctx, hcp, p, createOrUpdate, rootCASecret); err != nil {
totalKASClientCABundle := pkimanifests.TotalKASClientCABundle(hcp.Namespace)
if err := r.Client.Get(ctx, client.ObjectKeyFromObject(totalKASClientCABundle), totalKASClientCABundle); err != nil && !apierrors.IsNotFound(err) {
return fmt.Errorf("failed to fetch KAS total client CA bundle: %w", err)
}

if err := r.setupKASClientSigners(ctx, hcp, p, createOrUpdate, rootCASecret, totalKASClientCABundle); err != nil {
return err
}

Expand Down Expand Up @@ -3534,6 +3550,40 @@ func removeServiceCAAnnotationAndSecret(ctx context.Context, c client.Client, se
return nil
}

func (r *HostedControlPlaneReconciler) reconcileControlPlanePKIOperator(ctx context.Context, hcp *hyperv1.HostedControlPlane, releaseImageProvider *imageprovider.ReleaseImageProvider, createOrUpdate upsert.CreateOrUpdateFN, openShiftTrustedCABundleConfigMapForCPOExists bool, certRotationScale time.Duration) error {
ownerRef := config.OwnerRefFrom(hcp)

sa := manifests.PKIOperatorServiceAccount(hcp.Namespace)
if _, err := createOrUpdate(ctx, r.Client, sa, func() error {
return pkioperator.ReconcileServiceAccount(sa, ownerRef)
}); err != nil {
return fmt.Errorf("failed to reconcile control plane pki operator service account: %w", err)
}

role := manifests.PKIOperatorRole(hcp.Namespace)
if _, err := createOrUpdate(ctx, r.Client, role, func() error {
return pkioperator.ReconcileRole(role, ownerRef)
}); err != nil {
return fmt.Errorf("failed to reconcile control plane pki operator role: %w", err)
}

rb := manifests.PKIOperatorRoleBinding(hcp.Namespace)
if _, err := createOrUpdate(ctx, r.Client, rb, func() error {
return pkioperator.ReconcileRoleBinding(rb, role, sa, ownerRef)
}); err != nil {
return fmt.Errorf("failed to reconcile control plane pki operator rolebinding: %w", err)
}

deployment := manifests.PKIOperatorDeployment(hcp.Namespace)
if _, err := createOrUpdate(ctx, r.Client, deployment, func() error {
return pkioperator.ReconcileDeployment(deployment, openShiftTrustedCABundleConfigMapForCPOExists, hcp, releaseImageProvider.GetImage("hypershift"), r.SetDefaultSecurityContext, sa, certRotationScale)
}); err != nil {
return fmt.Errorf("failed to reconcile control plane pki operator deployment: %w", err)
}

return nil
}

func (r *HostedControlPlaneReconciler) reconcileHostedClusterConfigOperator(ctx context.Context, hcp *hyperv1.HostedControlPlane, releaseImageProvider *imageprovider.ReleaseImageProvider, infraStatus InfrastructureStatus, createOrUpdate upsert.CreateOrUpdateFN, openShiftTrustedCABundleConfigMapForCPOExists bool) error {
versions, err := releaseImageProvider.ComponentVersions()
if err != nil {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ func (r *HostedControlPlaneReconciler) setupKASClientSigners(
p *pki.PKIParams,
createOrUpdate upsert.CreateOrUpdateFN,
rootCASecret *corev1.Secret,
additionalClientCAs ...*corev1.ConfigMap,
) error {
reconcileSigner := func(s *corev1.Secret, reconciler signerReconciler) (*corev1.Secret, error) {
applyFunc := func() error {
Expand Down Expand Up @@ -204,6 +205,7 @@ func (r *HostedControlPlaneReconciler) setupKASClientSigners(
return pki.ReconcileTotalClientCA(
totalClientCA,
p.OwnerRef,
additionalClientCAs,
totalClientCABundle...,
)
}); err != nil {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
package manifests

import (
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
rbacv1 "k8s.io/api/rbac/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

func PKIOperatorDeployment(controlPlaneOperatorNamespace string) *appsv1.Deployment {
return &appsv1.Deployment{
ObjectMeta: metav1.ObjectMeta{
Namespace: controlPlaneOperatorNamespace,
Name: "control-plane-pki-operator",
},
}
}

func PKIOperatorServiceAccount(controlPlaneOperatorNamespace string) *corev1.ServiceAccount {
return &corev1.ServiceAccount{
ObjectMeta: metav1.ObjectMeta{
Namespace: controlPlaneOperatorNamespace,
Name: "control-plane-pki-operator",
},
}
}

func PKIOperatorRole(controlPlaneOperatorNamespace string) *rbacv1.Role {
return &rbacv1.Role{
ObjectMeta: metav1.ObjectMeta{
Namespace: controlPlaneOperatorNamespace,
Name: "control-plane-pki-operator",
},
}
}

func PKIOperatorRoleBinding(controlPlaneOperatorNamespace string) *rbacv1.RoleBinding {
return &rbacv1.RoleBinding{
ObjectMeta: metav1.ObjectMeta{
Namespace: controlPlaneOperatorNamespace,
Name: "control-plane-pki-operator",
},
}
}
17 changes: 15 additions & 2 deletions control-plane-operator/controllers/hostedcontrolplane/pki/ca.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,21 @@ func ReconcileAggregatorClientCA(cm *corev1.ConfigMap, ownerRef config.OwnerRef,
return reconcileAggregateCA(cm, ownerRef, signer)
}

func ReconcileTotalClientCA(cm *corev1.ConfigMap, ownerRef config.OwnerRef, signers ...*corev1.Secret) error {
return reconcileAggregateCA(cm, ownerRef, signers...)
func ReconcileTotalClientCA(cm *corev1.ConfigMap, ownerRef config.OwnerRef, additional []*corev1.ConfigMap, signers ...*corev1.Secret) error {
if err := reconcileAggregateCA(cm, ownerRef, signers...); err != nil {
return err
}
combined := &bytes.Buffer{}
if _, err := combined.WriteString(cm.Data[certs.CASignerCertMapKey]); err != nil {
return err
}
for _, add := range additional {
if _, err := combined.WriteString(add.Data[certs.OCPCASignerCertMapKey]); err != nil {
return err
}
}
cm.Data[certs.CASignerCertMapKey] = combined.String()
return nil
}

func ReconcileKubeletClientCA(cm *corev1.ConfigMap, ownerRef config.OwnerRef, signers ...*corev1.Secret) error {
Expand Down
Loading