From d678aea8f78e48696c3608b2ad12ce58c1a2ce1d Mon Sep 17 00:00:00 2001 From: nasark Date: Tue, 26 Sep 2023 16:21:23 -0400 Subject: [PATCH] test #2 --- .../cr_migration/20210503163000_initial_migration.go | 2 +- .../cr_migration/20210504113000_migrate_image_names.go | 4 ++-- .../api/v1alpha1/helpers/cr_migration/cr_migration.go | 2 +- .../api/v1alpha1/helpers/miq-components/app-secret.go | 2 +- .../api/v1alpha1/helpers/miq-components/application.go | 2 +- .../api/v1alpha1/helpers/miq-components/cr.go | 2 +- .../api/v1alpha1/helpers/miq-components/httpd.go | 4 ++-- .../api/v1alpha1/helpers/miq-components/httpd_conf.go | 4 ++-- .../api/v1alpha1/helpers/miq-components/kafka.go | 2 +- .../api/v1alpha1/helpers/miq-components/memcached.go | 8 ++++---- .../v1alpha1/helpers/miq-components/network_policies.go | 2 +- .../api/v1alpha1/helpers/miq-components/operator.go | 2 +- .../api/v1alpha1/helpers/miq-components/orchestrator.go | 2 +- .../api/v1alpha1/helpers/miq-components/postgresql.go | 2 +- .../api/v1alpha1/helpers/miq-components/rbac.go | 2 +- .../api/v1alpha1/helpers/miq-components/utils/util.go | 2 +- manageiq-operator/cmd/main.go | 4 ++-- .../internal/controller/manageiq_controller.go | 6 +++--- manageiq-operator/internal/controller/suite_test.go | 2 +- 19 files changed, 28 insertions(+), 28 deletions(-) diff --git a/manageiq-operator/api/v1alpha1/helpers/cr_migration/20210503163000_initial_migration.go b/manageiq-operator/api/v1alpha1/helpers/cr_migration/20210503163000_initial_migration.go index da50d9aca..4887706b9 100644 --- a/manageiq-operator/api/v1alpha1/helpers/cr_migration/20210503163000_initial_migration.go +++ b/manageiq-operator/api/v1alpha1/helpers/cr_migration/20210503163000_initial_migration.go @@ -1,7 +1,7 @@ package cr_migration import ( - miqv1alpha1 "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1" + miqv1alpha1 "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1" ) func migrate20210503163000(cr *miqv1alpha1.ManageIQ) *miqv1alpha1.ManageIQ { diff --git a/manageiq-operator/api/v1alpha1/helpers/cr_migration/20210504113000_migrate_image_names.go b/manageiq-operator/api/v1alpha1/helpers/cr_migration/20210504113000_migrate_image_names.go index 9850d8850..63d56ea2e 100644 --- a/manageiq-operator/api/v1alpha1/helpers/cr_migration/20210504113000_migrate_image_names.go +++ b/manageiq-operator/api/v1alpha1/helpers/cr_migration/20210504113000_migrate_image_names.go @@ -1,8 +1,8 @@ package cr_migration import ( - miqv1alpha1 "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1" - miqtool "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1/helpers/miq-components" + miqv1alpha1 "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1" + miqtool "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1/helpers/miq-components" ) func migrate20210504113000(cr *miqv1alpha1.ManageIQ) *miqv1alpha1.ManageIQ { diff --git a/manageiq-operator/api/v1alpha1/helpers/cr_migration/cr_migration.go b/manageiq-operator/api/v1alpha1/helpers/cr_migration/cr_migration.go index acf7f4ffc..9f592083c 100644 --- a/manageiq-operator/api/v1alpha1/helpers/cr_migration/cr_migration.go +++ b/manageiq-operator/api/v1alpha1/helpers/cr_migration/cr_migration.go @@ -1,7 +1,7 @@ package cr_migration import ( - miqv1alpha1 "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1" + miqv1alpha1 "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" ) diff --git a/manageiq-operator/api/v1alpha1/helpers/miq-components/app-secret.go b/manageiq-operator/api/v1alpha1/helpers/miq-components/app-secret.go index 5b0a71743..e332fc5ae 100644 --- a/manageiq-operator/api/v1alpha1/helpers/miq-components/app-secret.go +++ b/manageiq-operator/api/v1alpha1/helpers/miq-components/app-secret.go @@ -3,7 +3,7 @@ package miqtools import ( "context" - miqv1alpha1 "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1" + miqv1alpha1 "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1" miqutils "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1/helpers/miq-components/utils" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/manageiq-operator/api/v1alpha1/helpers/miq-components/application.go b/manageiq-operator/api/v1alpha1/helpers/miq-components/application.go index 2494ed455..894711344 100644 --- a/manageiq-operator/api/v1alpha1/helpers/miq-components/application.go +++ b/manageiq-operator/api/v1alpha1/helpers/miq-components/application.go @@ -1,7 +1,7 @@ package miqtools import ( - miqv1alpha1 "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1" + miqv1alpha1 "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1" miqutils "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1/helpers/miq-components/utils" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/manageiq-operator/api/v1alpha1/helpers/miq-components/cr.go b/manageiq-operator/api/v1alpha1/helpers/miq-components/cr.go index 64fa8a313..c0af150a8 100644 --- a/manageiq-operator/api/v1alpha1/helpers/miq-components/cr.go +++ b/manageiq-operator/api/v1alpha1/helpers/miq-components/cr.go @@ -2,7 +2,7 @@ package miqtools import ( "context" - miqv1alpha1 "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1" + miqv1alpha1 "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1" miqutils "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1/helpers/miq-components/utils" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" diff --git a/manageiq-operator/api/v1alpha1/helpers/miq-components/httpd.go b/manageiq-operator/api/v1alpha1/helpers/miq-components/httpd.go index 5fc76e291..0cbde5047 100644 --- a/manageiq-operator/api/v1alpha1/helpers/miq-components/httpd.go +++ b/manageiq-operator/api/v1alpha1/helpers/miq-components/httpd.go @@ -6,9 +6,9 @@ import ( "encoding/json" "fmt" - miqv1alpha1 "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1" + miqv1alpha1 "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1" miqutils "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1/helpers/miq-components/utils" - tlstools "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1/helpers/tlstools" + tlstools "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1/helpers/tlstools" routev1 "github.com/openshift/api/route/v1" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/manageiq-operator/api/v1alpha1/helpers/miq-components/httpd_conf.go b/manageiq-operator/api/v1alpha1/helpers/miq-components/httpd_conf.go index 20f5b367d..fce71b3c7 100644 --- a/manageiq-operator/api/v1alpha1/helpers/miq-components/httpd_conf.go +++ b/manageiq-operator/api/v1alpha1/helpers/miq-components/httpd_conf.go @@ -2,7 +2,7 @@ package miqtools import ( "fmt" - miqv1alpha1 "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1" + miqv1alpha1 "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1" ) // auth-configuration.conf @@ -10,7 +10,7 @@ func httpdAuthConfigurationConf() string { return ` # External Authentication Configuration File # -# For details on usage please see https://github.com/ManageIQ/manageiq-pods/blob/master/README.md#configuring-external-authentication +# For details on usage please see https://github.com/nasark/manageiq-pods/blob/master/README.md#configuring-external-authentication ` } diff --git a/manageiq-operator/api/v1alpha1/helpers/miq-components/kafka.go b/manageiq-operator/api/v1alpha1/helpers/miq-components/kafka.go index 6abdd8c64..118aab850 100644 --- a/manageiq-operator/api/v1alpha1/helpers/miq-components/kafka.go +++ b/manageiq-operator/api/v1alpha1/helpers/miq-components/kafka.go @@ -3,7 +3,7 @@ package miqtools import ( "context" - miqv1alpha1 "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1" + miqv1alpha1 "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1" miqutils "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1/helpers/miq-components/utils" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/manageiq-operator/api/v1alpha1/helpers/miq-components/memcached.go b/manageiq-operator/api/v1alpha1/helpers/miq-components/memcached.go index 5408b1fed..f2a9b8d09 100644 --- a/manageiq-operator/api/v1alpha1/helpers/miq-components/memcached.go +++ b/manageiq-operator/api/v1alpha1/helpers/miq-components/memcached.go @@ -1,7 +1,7 @@ package miqtools import ( - miqv1alpha1 "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1" + miqv1alpha1 "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1" miqutils "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1/helpers/miq-components/utils" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" @@ -95,13 +95,13 @@ func NewMemcachedDeployment(cr *miqv1alpha1.ManageIQ, scheme *runtime.Scheme, cl } miqutils.addAnnotations(cr.Spec.AppAnnotations, &deployment.Spec.Template.ObjectMeta) deployment.Spec.Template.Spec.Containers = []corev1.Container{container} - deployment.Spec.Template.Spec.Containers[0].SecurityContext = DefaultSecurityContext() + deployment.Spec.Template.Spec.Containers[0].SecurityContext = miqutils.DefaultSecurityContext() deployment.Spec.Template.Spec.ServiceAccountName = defaultServiceAccountName(cr.Spec.AppName) - addInternalCertificate(cr, deployment, client, "memcached", "/root") + miqutils.addInternalCertificate(cr, deployment, client, "memcached", "/root") if secret := miqutils.InternalCertificatesSecret(cr, client); secret.Data["memcached_crt"] != nil && secret.Data["memcached_key"] != nil { - deployment.Spec.Template.Spec.Containers[0].Env = addOrUpdateEnvVar(deployment.Spec.Template.Spec.Containers[0].Env, corev1.EnvVar{Name: "MEMCACHED_EXTRA_PARAMETERS", Value: "-Z -o ssl_chain_cert=/root/server.crt -o ssl_key=/root/server.key -p 11211"}) + deployment.Spec.Template.Spec.Containers[0].Env = miqutils.addOrUpdateEnvVar(deployment.Spec.Template.Spec.Containers[0].Env, corev1.EnvVar{Name: "MEMCACHED_EXTRA_PARAMETERS", Value: "-Z -o ssl_chain_cert=/root/server.crt -o ssl_key=/root/server.key -p 11211"}) } return nil diff --git a/manageiq-operator/api/v1alpha1/helpers/miq-components/network_policies.go b/manageiq-operator/api/v1alpha1/helpers/miq-components/network_policies.go index 2fc0b873b..a7b2f311c 100644 --- a/manageiq-operator/api/v1alpha1/helpers/miq-components/network_policies.go +++ b/manageiq-operator/api/v1alpha1/helpers/miq-components/network_policies.go @@ -1,7 +1,7 @@ package miqtools import ( - miqv1alpha1 "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1" + miqv1alpha1 "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1" miqutils "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1/helpers/miq-components/utils" corev1 "k8s.io/api/core/v1" networkingv1 "k8s.io/api/networking/v1" diff --git a/manageiq-operator/api/v1alpha1/helpers/miq-components/operator.go b/manageiq-operator/api/v1alpha1/helpers/miq-components/operator.go index 586c7e9fe..11269b8d5 100644 --- a/manageiq-operator/api/v1alpha1/helpers/miq-components/operator.go +++ b/manageiq-operator/api/v1alpha1/helpers/miq-components/operator.go @@ -3,7 +3,7 @@ package miqtools import ( "context" - miqv1alpha1 "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1" + miqv1alpha1 "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1" miqutils "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1/helpers/miq-components/utils" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/manageiq-operator/api/v1alpha1/helpers/miq-components/orchestrator.go b/manageiq-operator/api/v1alpha1/helpers/miq-components/orchestrator.go index 34cd2fedb..966bc282c 100644 --- a/manageiq-operator/api/v1alpha1/helpers/miq-components/orchestrator.go +++ b/manageiq-operator/api/v1alpha1/helpers/miq-components/orchestrator.go @@ -3,7 +3,7 @@ package miqtools import ( "context" - miqv1alpha1 "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1" + miqv1alpha1 "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1" miqutils "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1/helpers/miq-components/utils" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/manageiq-operator/api/v1alpha1/helpers/miq-components/postgresql.go b/manageiq-operator/api/v1alpha1/helpers/miq-components/postgresql.go index 26f84c20a..4f72fa3f8 100644 --- a/manageiq-operator/api/v1alpha1/helpers/miq-components/postgresql.go +++ b/manageiq-operator/api/v1alpha1/helpers/miq-components/postgresql.go @@ -3,7 +3,7 @@ package miqtools import ( "context" - miqv1alpha1 "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1" + miqv1alpha1 "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1" miqutils "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1/helpers/miq-components/utils" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/manageiq-operator/api/v1alpha1/helpers/miq-components/rbac.go b/manageiq-operator/api/v1alpha1/helpers/miq-components/rbac.go index 46a4605af..6c3dfd1d2 100644 --- a/manageiq-operator/api/v1alpha1/helpers/miq-components/rbac.go +++ b/manageiq-operator/api/v1alpha1/helpers/miq-components/rbac.go @@ -3,7 +3,7 @@ package miqtools import ( "fmt" - miqv1alpha1 "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1" + miqv1alpha1 "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1" miqutils "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1/helpers/miq-components/utils" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/manageiq-operator/api/v1alpha1/helpers/miq-components/utils/util.go b/manageiq-operator/api/v1alpha1/helpers/miq-components/utils/util.go index 612003d97..20ccdd966 100644 --- a/manageiq-operator/api/v1alpha1/helpers/miq-components/utils/util.go +++ b/manageiq-operator/api/v1alpha1/helpers/miq-components/utils/util.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - miqv1alpha1 "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1" + miqv1alpha1 "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" diff --git a/manageiq-operator/cmd/main.go b/manageiq-operator/cmd/main.go index ffb71ff77..790c39320 100644 --- a/manageiq-operator/cmd/main.go +++ b/manageiq-operator/cmd/main.go @@ -34,8 +34,8 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - manageiqv1alpha1 "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1" - "github.com/ManageIQ/manageiq-pods/manageiq-operator/internal/controller" + manageiqv1alpha1 "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1" + "github.com/nasark/manageiq-pods/manageiq-operator/internal/controller" //+kubebuilder:scaffold:imports ) diff --git a/manageiq-operator/internal/controller/manageiq_controller.go b/manageiq-operator/internal/controller/manageiq_controller.go index d1e3c7810..fe78629d1 100644 --- a/manageiq-operator/internal/controller/manageiq_controller.go +++ b/manageiq-operator/internal/controller/manageiq_controller.go @@ -33,9 +33,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" - miqv1alpha1 "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1" - cr_migration "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1/helpers/cr_migration" - miqtool "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1/helpers/miq-components" + miqv1alpha1 "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1" + cr_migration "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1/helpers/cr_migration" + miqtool "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1/helpers/miq-components" miqutils "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1/helpers/miq-components/utils" apimeta "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/manageiq-operator/internal/controller/suite_test.go b/manageiq-operator/internal/controller/suite_test.go index 99438addf..c7e27a1d9 100644 --- a/manageiq-operator/internal/controller/suite_test.go +++ b/manageiq-operator/internal/controller/suite_test.go @@ -29,7 +29,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - manageiqorgv1alpha1 "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1" + manageiqorgv1alpha1 "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1" //+kubebuilder:scaffold:imports )