From 194366400e249e1dddea78a60b6c206e4132cb6a Mon Sep 17 00:00:00 2001 From: Firas Ghanmi Date: Sat, 17 Aug 2024 12:36:14 +0200 Subject: [PATCH] updates --- api/v1alpha1/common.go | 5 ++--- bundle/manifests/rhtas-operator.clusterserviceversion.yaml | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/api/v1alpha1/common.go b/api/v1alpha1/common.go index d9ad110f7..05aa845a3 100644 --- a/api/v1alpha1/common.go +++ b/api/v1alpha1/common.go @@ -107,7 +107,6 @@ type Pvc struct { AccessModes []PersistentVolumeAccessMode `json:"accessModes,omitempty"` } -<<<<<<< HEAD type Auth struct { // Environmental variables used to define authentication parameters //+optional @@ -115,7 +114,8 @@ type Auth struct { // Secret ref to be mounted inside a pod, Mount path defaults to /var/run/secrets/tas/auth //+optional SecretMount []SecretKeySelector `json:"secretMount,omitempty"` -======= +} + // TLSCert defines fields for TLS certificate // +kubebuilder:validation:XValidation:rule=(!has(self.certRef) || has(self.privateKeyRef)),message=privateKeyRef cannot be empty type TLSCert struct { @@ -128,7 +128,6 @@ type TLSCert struct { // Reference to CA certificate //+optional CACertRef *LocalObjectReference `json:"CACertRef,omitempty"` ->>>>>>> 8dc3af9 (Add TLS to Rekor and Trillian services) } // TLS (Transport Layer Security) Configuration for enabling service encryption. diff --git a/bundle/manifests/rhtas-operator.clusterserviceversion.yaml b/bundle/manifests/rhtas-operator.clusterserviceversion.yaml index f843bd3c1..7950bb27f 100644 --- 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://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", + "Issuer": "https://your-oidc-issuer-url", + "IssuerURL": "https://your-oidc-issuer-url", "Type": "email" } ]