resolve conflicts+updates

securesign · Aug 31, 2024 · 644eb84 · 644eb84
1 parent d84e95b
commit 644eb84
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 8 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"
                   }
                 ]
@@ -292,7 +292,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: