From 09f781fa4d569a661f4c18a4269a66331d5a5c21 Mon Sep 17 00:00:00 2001 From: Jan Bouska Date: Thu, 15 Feb 2024 12:40:46 +0100 Subject: [PATCH] Rename conditions --- controllers/ctlog/actions/constants.go | 2 +- controllers/fulcio/actions/constants.go | 2 +- controllers/fulcio/actions/generate_cert.go | 2 +- controllers/rekor/actions/constants.go | 6 +++--- controllers/tuf/actions/constants.go | 3 +-- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/controllers/ctlog/actions/constants.go b/controllers/ctlog/actions/constants.go index cc8dc28b6..4e9175d39 100644 --- a/controllers/ctlog/actions/constants.go +++ b/controllers/ctlog/actions/constants.go @@ -5,5 +5,5 @@ const ( ComponentName = "ctlog" RBACName = "ctlog" - CertCondition = "FulcioCert" + CertCondition = "FulcioCertAvailable" ) diff --git a/controllers/fulcio/actions/constants.go b/controllers/fulcio/actions/constants.go index 136fcc2a2..6dad1edb2 100644 --- a/controllers/fulcio/actions/constants.go +++ b/controllers/fulcio/actions/constants.go @@ -7,5 +7,5 @@ const ( ServiceMonitorName = "fulcio-metrics" RBACName = "fulcio" - CertCondition = "FulcioCert" + CertCondition = "FulcioCertAvailable" ) diff --git a/controllers/fulcio/actions/generate_cert.go b/controllers/fulcio/actions/generate_cert.go index 46469f11e..e37d0aa12 100644 --- a/controllers/fulcio/actions/generate_cert.go +++ b/controllers/fulcio/actions/generate_cert.go @@ -70,7 +70,7 @@ func (g generateCert) Handle(ctx context.Context, instance *v1alpha1.Fulcio) *ac config, err := g.setupCert(instance) if err != nil { - if !meta.IsStatusConditionFalse(instance.Status.Conditions, "FulcioCert") { + if !meta.IsStatusConditionFalse(instance.Status.Conditions, CertCondition) { meta.SetStatusCondition(&instance.Status.Conditions, metav1.Condition{ Type: CertCondition, Status: metav1.ConditionFalse, diff --git a/controllers/rekor/actions/constants.go b/controllers/rekor/actions/constants.go index f31740c25..6e1d93a1d 100644 --- a/controllers/rekor/actions/constants.go +++ b/controllers/rekor/actions/constants.go @@ -10,7 +10,7 @@ const ( RedisComponentName = "rekor-redis" UIComponentName = "rekor-ui" BackfillRedisCronJobName = "backfill-redis" - UICondition = "RekorUi" - ServerCondition = "Server" - RedisCondition = "Redis" + UICondition = "UiAvailable" + ServerCondition = "ServerAvailable" + RedisCondition = "RedisAvailable" ) diff --git a/controllers/tuf/actions/constants.go b/controllers/tuf/actions/constants.go index 66ce936a6..a6498b201 100644 --- a/controllers/tuf/actions/constants.go +++ b/controllers/tuf/actions/constants.go @@ -3,6 +3,5 @@ package actions const ( ComponentName = "tuf" DeploymentName = "tuf" - - RBACName = "tuf" + RBACName = "tuf" )