diff --git a/config/default/images.env b/config/default/images.env index 40e8c0da1..298cee6e5 100644 --- a/config/default/images.env +++ b/config/default/images.env @@ -1,4 +1,4 @@ -RELATED_IMAGE_TRILLIAN_LOG_SIGNER=registry.redhat.io/rhtas/trillian-logsigner-rhel9@sha256:ee9be1a0edbe52d31fcf9755ac3ec3aeb2d5e8388e47ac8c2e2d83125fd50c44 +RELATED_IMAGE_TRILLIAN_LOG_SIGNER=registry.redhat.io/rhtas/trillian-logsigner-rhel9@sha256:f882a10cf796cb3652d43bdc6e6033891290983427b679fc60fd812d7ccd2fcb RELATED_IMAGE_TRILLIAN_LOG_SERVER=registry.redhat.io/rhtas/trillian-logserver-rhel9@sha256:99285a83df8fd97e4fb0338feb35aa556171890154a00ec24ee7473ac8241d32 RELATED_IMAGE_TRILLIAN_DB=registry.redhat.io/rhtas/trillian-database-rhel9@sha256:1921a746556119f6e0d6a41dfb528555e38eda4ff046ebb889e7f8a66c13cd03 RELATED_IMAGE_TRILLIAN_NETCAT=registry.redhat.io/openshift4/ose-tools-rhel9@sha256:33582d1bf64c7273392950088b28025b5d063ac324be3fc1060513e47ed40b98 diff --git a/config/manifests/bases/rhtas-operator.clusterserviceversion.yaml b/config/manifests/bases/rhtas-operator.clusterserviceversion.yaml index 28d3dbfa4..624452c1a 100644 --- a/config/manifests/bases/rhtas-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/rhtas-operator.clusterserviceversion.yaml @@ -68,8 +68,7 @@ spec: and trustworthiness of their software supply chains. displayName: Red Hat Trusted Artifact Signer icon: - - base64data: |- - <?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="38" height="38" viewBox="0 0 38 38"><title>Red Hat Trusted Artifact Signer icon</title>
<desc>Cloud, RHTAS</desc>
<metadata><?xpacket begin="﻿" id="W5M0MpCehiHzreSzNTczkc9d"?>
<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 8.0-c001 1.000000, 0000/00/00-00:00:00        ">
   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
      <rdf:Description rdf:about=""
            xmlns:xmp="http://ns.adobe.com/xap/1.0/"
            xmlns:dc="http://purl.org/dc/elements/1.1/"
            xmlns:cq="http://www.day.com/jcr/cq/1.0"
            xmlns:tiff="http://ns.adobe.com/tiff/1.0/"
            xmlns:xmpRights="http://ns.adobe.com/xap/1.0/rights/">
         <xmp:rhcc-effective-on>2024-03-01T15:27:47.848Z</xmp:rhcc-effective-on>
         <xmp:rhcc-metadata-complete-moderator>pending</xmp:rhcc-metadata-complete-moderator>
         <xmp:rhcc-translation-id>TRA2bece562-cf06-439f-9cf0-7de36236f9aa</xmp:rhcc-translation-id>
         <xmp:brand-content-type>Icon</xmp:brand-content-type>
         <xmp:CreateDate>2024-03-01T15:27:47.848Z</xmp:CreateDate>
         <xmp:rhcc-aspect-ratio>square</xmp:rhcc-aspect-ratio>
         <xmp:rhcc-effective-on-set-on-upload>true</xmp:rhcc-effective-on-set-on-upload>
         <xmp:rhcc-metadata-complete-uploader>pending</xmp:rhcc-metadata-complete-uploader>
         <xmp:rhcc-file-last-modified>2024-07-12T23:51:52.865Z</xmp:rhcc-file-last-modified>
         <xmp:rhcc-audience>rhcc-audience:internal</xmp:rhcc-audience>
         <xmp:rhcc-rights-restricted>no</xmp:rhcc-rights-restricted>
         <xmp:brand-content-subtype>Technology icon</xmp:brand-content-subtype>
         <xmp:rhcc-derivative-id>DER2bece562-cf06-439f-9cf0-7de36236f9aa</xmp:rhcc-derivative-id>
         <xmp:rhcc-uploaded-by>pmeilleu@redhat.com</xmp:rhcc-uploaded-by>
         <xmp:brand-logo-color>Standard</xmp:brand-logo-color>
         <xmp:rhcc-notify-portal-subscribers-on-change>yes</xmp:rhcc-notify-portal-subscribers-on-change>
         <xmp:rhcc-product>
            <rdf:Bag>
               <rdf:li>rhcc-product:red-hat-trusted-software-supply-chain</rdf:li>
            </rdf:Bag>
         </xmp:rhcc-product>
         <xmp:brand-subtype>
            <rdf:Bag>
               <rdf:li>Technology icon</rdf:li>
            </rdf:Bag>
         </xmp:brand-subtype>
         <dc:format>image/svg+xml</dc:format>
         <dc:modified>2024-05-10T00:33:56.483Z</dc:modified>
         <dc:title>
            <rdf:Alt>
               <rdf:li xml:lang="x-default">Red Hat Trusted Artifact Signer icon</rdf:li>
            </rdf:Alt>
         </dc:title>
         <dc:description>
            <rdf:Alt>
               <rdf:li xml:lang="x-default">Cloud, RHTAS</rdf:li>
            </rdf:Alt>
         </dc:description>
         <cq:lastReplicationAction_scene7>Activate</cq:lastReplicationAction_scene7>
         <cq:lastReplicationAction_publish>Activate</cq:lastReplicationAction_publish>
         <cq:lastReplicated_publish>2024-10-02T19:54:04.202Z</cq:lastReplicated_publish>
         <cq:lastReplicatedBy>workflow-process-service</cq:lastReplicatedBy>
         <cq:lastReplicationAction>Activate</cq:lastReplicationAction>
         <cq:lastReplicatedBy_publish>workflow-process-service</cq:lastReplicatedBy_publish>
         <cq:isDelivered>false</cq:isDelivered>
         <cq:lastReplicated>2024-10-02T19:54:04.202Z</cq:lastReplicated>
         <cq:lastReplicatedBy_scene7>workflow-process-service</cq:lastReplicatedBy_scene7>
         <cq:lastReplicated_scene7>2024-10-02T19:54:04.202Z</cq:lastReplicated_scene7>
         <tiff:ImageLength>38</tiff:ImageLength>
         <tiff:ImageWidth>38</tiff:ImageWidth>
         <xmpRights:UsageTerms>
            <rdf:Alt>
               <rdf:li xml:lang="x-default">Use technology icons to represent Red Hat products and components. Do not remove the icon from the bounding shape.</rdf:li>
            </rdf:Alt>
         </xmpRights:UsageTerms>
      </rdf:Description>
   </rdf:RDF>
</x:xmpmeta>
                                                                                                    
                                                                                                    
                                                                                                    
                                                                                                    
                                                                                                    
                                                                                                    
                                                                                                    
                                                                                                    
                                                                                                    
                                                                                                    
                                                                                                    
                                                                                                    
                                                                                                    
                                                                                                    
                                                                                                    
                                                                                                    
                                                                                                    
                                          
<?xpacket end="w"?></metadata>
<g id="uuid-046a7832-6925-4803-9782-f23c4ab2f3ea"><rect x="1" y="1" width="36" height="36" rx="9" ry="9" stroke-width="0"/><path d="m28,2.25c4.27336,0,7.75,3.47664,7.75,7.75v18c0,4.27336-3.47664,7.75-7.75,7.75H10c-4.27336,0-7.75-3.47664-7.75-7.75V10c0-4.27336,3.47664-7.75,7.75-7.75h18m0-1.25H10C5.02944,1,1,5.02943,1,10v18c0,4.97057,4.02944,9,9,9h18c4.97057,0,9-4.02943,9-9V10c0-4.97057-4.02943-9-9-9h0Z" fill="#4d4d4d" stroke-width="0"/></g><g id="uuid-301afa73-9371-4634-802f-c47250fc09c0"><path d="m17,14.375h-.375v-.875c0-1.72314-1.40234-3.125-3.125-3.125s-3.125,1.40186-3.125,3.125v.875h-.375c-.34473,0-.625.27979-.625.625v7c0,.34521.28027.625.625.625h7c.34473,0,.625-.27979.625-.625v-7c0-.34521-.28027-.625-.625-.625Zm-5.375-.875c0-1.03369.84082-1.875,1.875-1.875s1.875.84131,1.875,1.875v.875h-3.75v-.875Zm4.75,7.875h-5.75v-5.75h5.75v5.75Z" fill="#e00" stroke-width="0"/><path d="m29,24.375H9c-.34473,0-.625.27979-.625.625s.28027.625.625.625h20c.34473,0,.625-.27979.625-.625s-.28027-.625-.625-.625Z" fill="#fff" stroke-width="0"/><path d="m20,22.625c.08594,0,.17285-.01758.25391-.0542l3.59033-1.59827c.00049-.00024.00104-.00043.00153-.00067l.01361-.00604c.02795-.01239.04657-.0351.07172-.0509.03986-.0249.08301-.04425.11676-.078l4.39453-4.39502c.24316-.24414.24316-.63965,0-.88379-.24414-.24414-.64062-.24414-.88477,0l-3.95215,3.95312-1.11621-1.11621,5.95312-5.95312c.24316-.24414.24316-.63965,0-.88379-.24414-.24414-.64062-.24414-.88477,0l-6.39453,6.39502c-.02783.02795-.04114.06323-.06262.09467-.02179.03143-.05017.0567-.06628.09283l-1.60547,3.60498c-.10449.23633-.05371.51318.12891.69629.12012.11963.28027.18311.44238.18311Zm1.80652-3.14465l.71375.71375-1.28687.57251.57312-1.28625Z" fill="#fff" stroke-width="0"/></g></svg> + - base64data: <?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="38" height="38" viewBox="0 0 38 38"><title>Red Hat Trusted Artifact Signer icon</title>
<desc>Cloud, RHTAS</desc>
<metadata><?xpacket begin="﻿" id="W5M0MpCehiHzreSzNTczkc9d"?>
<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 8.0-c001 1.000000, 0000/00/00-00:00:00        ">
   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
      <rdf:Description rdf:about=""
            xmlns:xmp="http://ns.adobe.com/xap/1.0/"
            xmlns:dc="http://purl.org/dc/elements/1.1/"
            xmlns:cq="http://www.day.com/jcr/cq/1.0"
            xmlns:tiff="http://ns.adobe.com/tiff/1.0/"
            xmlns:xmpRights="http://ns.adobe.com/xap/1.0/rights/">
         <xmp:rhcc-effective-on>2024-03-01T15:27:47.848Z</xmp:rhcc-effective-on>
         <xmp:rhcc-metadata-complete-moderator>pending</xmp:rhcc-metadata-complete-moderator>
         <xmp:rhcc-translation-id>TRA2bece562-cf06-439f-9cf0-7de36236f9aa</xmp:rhcc-translation-id>
         <xmp:brand-content-type>Icon</xmp:brand-content-type>
         <xmp:CreateDate>2024-03-01T15:27:47.848Z</xmp:CreateDate>
         <xmp:rhcc-aspect-ratio>square</xmp:rhcc-aspect-ratio>
         <xmp:rhcc-effective-on-set-on-upload>true</xmp:rhcc-effective-on-set-on-upload>
         <xmp:rhcc-metadata-complete-uploader>pending</xmp:rhcc-metadata-complete-uploader>
         <xmp:rhcc-file-last-modified>2024-07-12T23:51:52.865Z</xmp:rhcc-file-last-modified>
         <xmp:rhcc-audience>rhcc-audience:internal</xmp:rhcc-audience>
         <xmp:rhcc-rights-restricted>no</xmp:rhcc-rights-restricted>
         <xmp:brand-content-subtype>Technology icon</xmp:brand-content-subtype>
         <xmp:rhcc-derivative-id>DER2bece562-cf06-439f-9cf0-7de36236f9aa</xmp:rhcc-derivative-id>
         <xmp:rhcc-uploaded-by>pmeilleu@redhat.com</xmp:rhcc-uploaded-by>
         <xmp:brand-logo-color>Standard</xmp:brand-logo-color>
         <xmp:rhcc-notify-portal-subscribers-on-change>yes</xmp:rhcc-notify-portal-subscribers-on-change>
         <xmp:rhcc-product>
            <rdf:Bag>
               <rdf:li>rhcc-product:red-hat-trusted-software-supply-chain</rdf:li>
            </rdf:Bag>
         </xmp:rhcc-product>
         <xmp:brand-subtype>
            <rdf:Bag>
               <rdf:li>Technology icon</rdf:li>
            </rdf:Bag>
         </xmp:brand-subtype>
         <dc:format>image/svg+xml</dc:format>
         <dc:modified>2024-05-10T00:33:56.483Z</dc:modified>
         <dc:title>
            <rdf:Alt>
               <rdf:li xml:lang="x-default">Red Hat Trusted Artifact Signer icon</rdf:li>
            </rdf:Alt>
         </dc:title>
         <dc:description>
            <rdf:Alt>
               <rdf:li xml:lang="x-default">Cloud, RHTAS</rdf:li>
            </rdf:Alt>
         </dc:description>
         <cq:lastReplicationAction_scene7>Activate</cq:lastReplicationAction_scene7>
         <cq:lastReplicationAction_publish>Activate</cq:lastReplicationAction_publish>
         <cq:lastReplicated_publish>2024-10-02T19:54:04.202Z</cq:lastReplicated_publish>
         <cq:lastReplicatedBy>workflow-process-service</cq:lastReplicatedBy>
         <cq:lastReplicationAction>Activate</cq:lastReplicationAction>
         <cq:lastReplicatedBy_publish>workflow-process-service</cq:lastReplicatedBy_publish>
         <cq:isDelivered>false</cq:isDelivered>
         <cq:lastReplicated>2024-10-02T19:54:04.202Z</cq:lastReplicated>
         <cq:lastReplicatedBy_scene7>workflow-process-service</cq:lastReplicatedBy_scene7>
         <cq:lastReplicated_scene7>2024-10-02T19:54:04.202Z</cq:lastReplicated_scene7>
         <tiff:ImageLength>38</tiff:ImageLength>
         <tiff:ImageWidth>38</tiff:ImageWidth>
         <xmpRights:UsageTerms>
            <rdf:Alt>
               <rdf:li xml:lang="x-default">Use technology icons to represent Red Hat products and components. Do not remove the icon from the bounding shape.</rdf:li>
            </rdf:Alt>
         </xmpRights:UsageTerms>
      </rdf:Description>
   </rdf:RDF>
</x:xmpmeta>
                                                                                                    
                                                                                                    
                                                                                                    
                                                                                                    
                                                                                                    
                                                                                                    
                                                                                                    
                                                                                                    
                                                                                                    
                                                                                                    
                                                                                                    
                                                                                                    
                                                                                                    
                                                                                                    
                                                                                                    
                                                                                                    
                                                                                                    
                                          
<?xpacket end="w"?></metadata>
<g id="uuid-046a7832-6925-4803-9782-f23c4ab2f3ea"><rect x="1" y="1" width="36" height="36" rx="9" ry="9" stroke-width="0"/><path d="m28,2.25c4.27336,0,7.75,3.47664,7.75,7.75v18c0,4.27336-3.47664,7.75-7.75,7.75H10c-4.27336,0-7.75-3.47664-7.75-7.75V10c0-4.27336,3.47664-7.75,7.75-7.75h18m0-1.25H10C5.02944,1,1,5.02943,1,10v18c0,4.97057,4.02944,9,9,9h18c4.97057,0,9-4.02943,9-9V10c0-4.97057-4.02943-9-9-9h0Z" fill="#4d4d4d" stroke-width="0"/></g><g id="uuid-301afa73-9371-4634-802f-c47250fc09c0"><path d="m17,14.375h-.375v-.875c0-1.72314-1.40234-3.125-3.125-3.125s-3.125,1.40186-3.125,3.125v.875h-.375c-.34473,0-.625.27979-.625.625v7c0,.34521.28027.625.625.625h7c.34473,0,.625-.27979.625-.625v-7c0-.34521-.28027-.625-.625-.625Zm-5.375-.875c0-1.03369.84082-1.875,1.875-1.875s1.875.84131,1.875,1.875v.875h-3.75v-.875Zm4.75,7.875h-5.75v-5.75h5.75v5.75Z" fill="#e00" stroke-width="0"/><path d="m29,24.375H9c-.34473,0-.625.27979-.625.625s.28027.625.625.625h20c.34473,0,.625-.27979.625-.625s-.28027-.625-.625-.625Z" fill="#fff" stroke-width="0"/><path d="m20,22.625c.08594,0,.17285-.01758.25391-.0542l3.59033-1.59827c.00049-.00024.00104-.00043.00153-.00067l.01361-.00604c.02795-.01239.04657-.0351.07172-.0509.03986-.0249.08301-.04425.11676-.078l4.39453-4.39502c.24316-.24414.24316-.63965,0-.88379-.24414-.24414-.64062-.24414-.88477,0l-3.95215,3.95312-1.11621-1.11621,5.95312-5.95312c.24316-.24414.24316-.63965,0-.88379-.24414-.24414-.64062-.24414-.88477,0l-6.39453,6.39502c-.02783.02795-.04114.06323-.06262.09467-.02179.03143-.05017.0567-.06628.09283l-1.60547,3.60498c-.10449.23633-.05371.51318.12891.69629.12012.11963.28027.18311.44238.18311Zm1.80652-3.14465l.71375.71375-1.28687.57251.57312-1.28625Z" fill="#fff" stroke-width="0"/></g></svg> mediatype: image/svg+xml install: spec: diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index 75328770d..79603d5fd 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -110,6 +110,16 @@ rules: - patch - update - watch +- apiGroups: + - coordination.k8s.io + resources: + - leases + verbs: + - create + - get + - patch + - update + - watch - apiGroups: - monitoring.coreos.com resources: diff --git a/internal/controller/trillian/actions/logsigner/deployment.go b/internal/controller/trillian/actions/logsigner/deployment.go index 9c44739b8..a64c03c87 100644 --- a/internal/controller/trillian/actions/logsigner/deployment.go +++ b/internal/controller/trillian/actions/logsigner/deployment.go @@ -62,7 +62,8 @@ func (i deployAction) Handle(ctx context.Context, instance *rhtasv1alpha1.Trilli Namespace: instance.Namespace, }, }, - trillianUtils.EnsureServerDeployment(instance, images.Registry.Get(images.TrillianLogSigner), actions.LogsignerDeploymentName, actions.RBACSignerName, labels, "--force_master=true"), + trillianUtils.EnsureServerDeployment(instance, images.Registry.Get(images.TrillianLogSigner), actions.LogsignerDeploymentName, actions.RBACSignerName, labels, + "--election_system=k8s", "--lock_namespace=$(NAMESPACE)", "--lock_holder_identity=$(POD_NAME)"), ensure.ControllerReference[*apps.Deployment](instance, i.Client), ensure.Labels[*apps.Deployment](slices.Collect(maps.Keys(labels)), labels), deployment.Proxy(), diff --git a/internal/controller/trillian/actions/logsigner/rbac.go b/internal/controller/trillian/actions/logsigner/rbac.go index 3d1c50798..05901f1f3 100644 --- a/internal/controller/trillian/actions/logsigner/rbac.go +++ b/internal/controller/trillian/actions/logsigner/rbac.go @@ -5,8 +5,17 @@ import ( "github.com/securesign/operator/internal/action" "github.com/securesign/operator/internal/action/rbac" "github.com/securesign/operator/internal/controller/trillian/actions" + rbacv1 "k8s.io/api/rbac/v1" ) func NewRBACAction() action.Action[*rhtasv1alpha1.Trillian] { - return rbac.NewAction[*rhtasv1alpha1.Trillian](actions.LogSignerComponentName, actions.RBACSignerName) + return rbac.NewAction[*rhtasv1alpha1.Trillian]( + actions.LogSignerComponentName, actions.RBACSignerName, + rbac.WithRule[*rhtasv1alpha1.Trillian]( + rbacv1.PolicyRule{ + APIGroups: []string{"coordination.k8s.io"}, + Resources: []string{"leases"}, + Verbs: []string{"create", "get", "update", "watch", "patch"}, + }), + ) } diff --git a/internal/controller/trillian/trillian_controller.go b/internal/controller/trillian/trillian_controller.go index 713700271..995835598 100644 --- a/internal/controller/trillian/trillian_controller.go +++ b/internal/controller/trillian/trillian_controller.go @@ -61,6 +61,7 @@ func NewReconciler(c client.Client, scheme *runtime.Scheme, recorder record.Even //+kubebuilder:rbac:groups=rhtas.redhat.com,resources=trillians,verbs=get;list;watch;create;update;patch;delete //+kubebuilder:rbac:groups=rhtas.redhat.com,resources=trillians/status,verbs=get;update;patch //+kubebuilder:rbac:groups=rhtas.redhat.com,resources=trillians/finalizers,verbs=update +//+kubebuilder:rbac:groups=coordination.k8s.io,resources=leases,verbs=get;watch;create;update;patch // Reconcile is part of the main kubernetes reconciliation loop which aims to // move the current state of the cluster closer to the desired state. diff --git a/internal/controller/trillian/utils/server-deployment.go b/internal/controller/trillian/utils/server-deployment.go index 3fe26b501..66dab1765 100644 --- a/internal/controller/trillian/utils/server-deployment.go +++ b/internal/controller/trillian/utils/server-deployment.go @@ -125,6 +125,22 @@ func EnsureServerDeployment(instance *v1alpha1.Trillian, image string, name stri }, } + podNameEnv := kubernetes.FindEnvByNameOrCreate(container, "POD_NAME") + podNameEnv.ValueFrom = &core.EnvVarSource{ + FieldRef: &core.ObjectFieldSelector{ + APIVersion: "v1", + FieldPath: "metadata.name", + }, + } + + namespaceEnv := kubernetes.FindEnvByNameOrCreate(container, "NAMESPACE") + namespaceEnv.ValueFrom = &core.EnvVarSource{ + FieldRef: &core.ObjectFieldSelector{ + APIVersion: "v1", + FieldPath: "metadata.namespace", + }, + } + port := kubernetes.FindPortByNameOrCreate(container, "8091-tcp") port.ContainerPort = actions.ServerPort port.Protocol = core.ProtocolTCP