resolve conflicts+updates

securesign · Aug 17, 2024 · 1219155 · 1219155
1 parent f63035a
commit 1219155
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 10 deletions.
diff --git a/api/v1alpha1/fulcio_types.go b/api/v1alpha1/fulcio_types.go
@@ -14,7 +14,7 @@ type FulcioSpec struct {
 	ExternalAccess ExternalAccess `json:"externalAccess,omitempty"`
 	// Ctlog service configuration
 	//+optional
-	//+kubebuilder:default:={port: 80, prefix: trusted-artifact-signer}
+	//+kubebuilder:default:={prefix: trusted-artifact-signer}
 	Ctlog CtlogService `json:"ctlog,omitempty"`
 	// Fulcio Configuration
 	//+required

diff --git a/bundle/manifests/rhtas-operator.clusterserviceversion.yaml b/bundle/manifests/rhtas-operator.clusterserviceversion.yaml
@@ -92,8 +92,8 @@ metadata:
                 "OIDCIssuers": [
                   {
                     "ClientID": "trusted-artifact-signer",
-                    "Issuer": "https://your-oidc-issuer-url",
-                    "IssuerURL": "https://your-oidc-issuer-url",
+                    "Issuer": "https://keycloak-keycloak-system.apps.rosa.ebh6v-tpwpi-a4f.ohpr.p3.openshiftapps.com/auth/realms/trusted-artifact-signer",
+                    "IssuerURL": "https://keycloak-keycloak-system.apps.rosa.ebh6v-tpwpi-a4f.ohpr.p3.openshiftapps.com/auth/realms/trusted-artifact-signer",
                     "Type": "email"
                   }
                 ]
@@ -192,7 +192,7 @@ metadata:
       ]
     capabilities: Seamless Upgrades
     containerImage: registry.redhat.io/rhtas/rhtas-rhel9-operator@sha256:a21f7128694a64989bf0d84a7a7da4c1ffc89edf62d594dc8bea7bcfe9ac08d3
-    createdAt: "2024-08-08T17:23:21Z"
+    createdAt: "2024-08-17T10:32:28Z"
     features.operators.openshift.io/cnf: "false"
     features.operators.openshift.io/cni: "false"
     features.operators.openshift.io/csi: "false"
@@ -204,7 +204,7 @@ metadata:
     features.operators.openshift.io/token-auth-azure: "false"
     features.operators.openshift.io/token-auth-gcp: "false"
     operators.openshift.io/valid-subscription: '["Red Hat Trusted Artifact Signer"]'
-    operators.operatorframework.io/builder: operator-sdk-v1.34.2
+    operators.operatorframework.io/builder: operator-sdk-v1.34.1
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
     repository: https://github.com/securesign/secure-sign-operator
     support: Red Hat

diff --git a/bundle/manifests/rhtas.redhat.com_fulcios.yaml b/bundle/manifests/rhtas.redhat.com_fulcios.yaml
@@ -223,7 +223,6 @@ spec:
                     (has(self.MetaIssuers) && (size(self.MetaIssuers) > 0))
               ctlog:
                 default:
-                  port: 80
                   prefix: trusted-artifact-signer
                 description: Ctlog service configuration
                 properties:

diff --git a/bundle/manifests/rhtas.redhat.com_securesigns.yaml b/bundle/manifests/rhtas.redhat.com_securesigns.yaml
@@ -431,7 +431,6 @@ spec:
                         || (has(self.MetaIssuers) && (size(self.MetaIssuers) > 0))
                   ctlog:
                     default:
-                      port: 80
                       prefix: trusted-artifact-signer
                     description: Ctlog service configuration
                     properties:

diff --git a/config/crd/bases/rhtas.redhat.com_fulcios.yaml b/config/crd/bases/rhtas.redhat.com_fulcios.yaml
@@ -223,7 +223,6 @@ spec:
                     (has(self.MetaIssuers) && (size(self.MetaIssuers) > 0))
               ctlog:
                 default:
-                  port: 80
                   prefix: trusted-artifact-signer
                 description: Ctlog service configuration
                 properties:

diff --git a/config/crd/bases/rhtas.redhat.com_securesigns.yaml b/config/crd/bases/rhtas.redhat.com_securesigns.yaml
@@ -431,7 +431,6 @@ spec:
                         || (has(self.MetaIssuers) && (size(self.MetaIssuers) > 0))
                   ctlog:
                     default:
-                      port: 80
                       prefix: trusted-artifact-signer
                     description: Ctlog service configuration
                     properties:

diff --git a/internal/controller/constants/images.go b/internal/controller/constants/images.go
@@ -17,7 +17,7 @@ var (
 
 	TufImage = "registry.redhat.io/rhtas/tuf-server-rhel9@sha256:092ee1327639c2c8fee809ea66ecd11ca7bc9951c1832391df0df6f1f4d62a6a"
 
-	CTLogImage = "registry.redhat.io/rhtas/certificate-transparency-rhel9@sha256:91ec4af2ae538c11cf8421488d41ba6f056b37eb4585eeec05a31e8c3ac73c68"
+	CTLogImage = "registry.redhat.io/rhtas/certificate-transparency-rhel9@sha256:91b59c4d9e4cf68847d6978cb86ba279754de9c0d10929d4c8053ef68390cf2a"
 
 	ClientServerImage    = "registry.access.redhat.com/ubi9/httpd-24@sha256:7874b82335a80269dcf99e5983c2330876f5fe8bdc33dc6aa4374958a2ffaaee"
 	ClientServerImage_cg = "registry.redhat.io/rhtas/client-server-cg-rhel9@sha256:987c630213065a6339b2b2582138f7b921473b86dfe82e91a002f08386a899ed"