Skip to content

Commit

Permalink
test changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@nasark
nasark committed Jan 21, 2024
1 parent 4627995 commit a672017
Show file tree
Hide file tree
Showing 21 changed files with 40 additions and 38 deletions.
4 changes: 2 additions & 2 deletions manageiq-operator/PROJECT
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ plugins:
manifests.sdk.operatorframework.io/v2: {}
scorecard.sdk.operatorframework.io/v2: {}
projectName: manageiq-operator
repo: github.com/ManageIQ/manageiq-pods/manageiq-operator
repo: github.com/nasark/manageiq-pods/manageiq-operator
resources:
- api:
crdVersion: v1
namespaced: true
controller: true
domain: manageiq.org
kind: ManageIQ
path: github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1
path: github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1
version: v1alpha1
version: "3"
2 changes: 1 addition & 1 deletion manageiq-operator/api/v1alpha1/helpers/cr_migration/20210503163000_initial_migration.go
View file
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions manageiq-operator/api/v1alpha1/helpers/cr_migration/20210504113000_migrate_image_names.go
View file
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion manageiq-operator/api/v1alpha1/helpers/cr_migration/cr_migration.go
View file
Original file line number Diff line number Diff line change
@@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion manageiq-operator/api/v1alpha1/helpers/miq-components/app-secret.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand Down
2 changes: 1 addition & 1 deletion manageiq-operator/api/v1alpha1/helpers/miq-components/application.go
View file
Original file line number Diff line number Diff line change
@@ -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"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand Down
2 changes: 1 addition & 1 deletion manageiq-operator/api/v1alpha1/helpers/miq-components/cr.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/types"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down
6 changes: 3 additions & 3 deletions manageiq-operator/api/v1alpha1/helpers/miq-components/httpd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"encoding/json"
"fmt"

miqv1alpha1 "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1"
tlstools "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1/helpers/tlstools"
miqutilsv1alpha1 "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1/miqutils"
miqv1alpha1 "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1"
tlstools "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1/helpers/tlstools"
miqutilsv1alpha1 "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1/miqutils"
routev1 "github.com/openshift/api/route/v1"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
Expand Down
4 changes: 2 additions & 2 deletions manageiq-operator/api/v1alpha1/helpers/miq-components/httpd_conf.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ 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
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
`
}

Expand Down
6 changes: 3 additions & 3 deletions manageiq-operator/api/v1alpha1/helpers/miq-components/kafka/kafka.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package miqkafka
import (
"bytes"
"context"
miqv1alpha1 "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1"
miqtool "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1/helpers/miq-components"
miqutilsv1alpha1 "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1/miqutils"
miqv1alpha1 "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1"
miqtool "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1/helpers/miq-components"
miqutilsv1alpha1 "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1/miqutils"
olmv1 "github.com/operator-framework/api/pkg/operators/v1"
olmv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
corev1 "k8s.io/api/core/v1"
Expand Down
4 changes: 2 additions & 2 deletions manageiq-operator/api/v1alpha1/helpers/miq-components/memcached.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package miqtools

import (
miqv1alpha1 "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1"
miqutilsv1alpha1 "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1/miqutils"
miqv1alpha1 "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1"
miqutilsv1alpha1 "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1/miqutils"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion manageiq-operator/api/v1alpha1/helpers/miq-components/network_policies.go
View file
Original file line number Diff line number Diff line change
@@ -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"
corev1 "k8s.io/api/core/v1"
networkingv1 "k8s.io/api/networking/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
4 changes: 2 additions & 2 deletions manageiq-operator/api/v1alpha1/helpers/miq-components/operator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package miqtools
import (
"context"

miqv1alpha1 "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1"
miqutilsv1alpha1 "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1/miqutils"
miqv1alpha1 "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1"
miqutilsv1alpha1 "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1/miqutils"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
rbacv1 "k8s.io/api/rbac/v1"
Expand Down
4 changes: 2 additions & 2 deletions manageiq-operator/api/v1alpha1/helpers/miq-components/orchestrator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package miqtools
import (
"context"

miqv1alpha1 "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1"
miqutilsv1alpha1 "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1/miqutils"
miqv1alpha1 "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1"
miqutilsv1alpha1 "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1/miqutils"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
rbacv1 "k8s.io/api/rbac/v1"
Expand Down
4 changes: 2 additions & 2 deletions manageiq-operator/api/v1alpha1/helpers/miq-components/postgresql.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package miqtools
import (
"context"

miqv1alpha1 "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1"
miqutilsv1alpha1 "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1/miqutils"
miqv1alpha1 "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1"
miqutilsv1alpha1 "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1/miqutils"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
resource "k8s.io/apimachinery/pkg/api/resource"
Expand Down
2 changes: 1 addition & 1 deletion manageiq-operator/api/v1alpha1/helpers/miq-components/rbac.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
corev1 "k8s.io/api/core/v1"
rbacv1 "k8s.io/api/rbac/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
4 changes: 2 additions & 2 deletions manageiq-operator/api/v1alpha1/helpers/miq-components/util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"fmt"

miqv1alpha1 "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1"
miqutilsv1alpha1 "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1/miqutils"
miqv1alpha1 "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1"
miqutilsv1alpha1 "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1/miqutils"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
Expand Down
4 changes: 2 additions & 2 deletions manageiq-operator/cmd/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/log/zap"
ctrlmetrics "sigs.k8s.io/controller-runtime/pkg/metrics/server"

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"
olmv1 "github.com/operator-framework/api/pkg/operators/v1"
olmv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
//+kubebuilder:scaffold:imports
Expand Down
2 changes: 1 addition & 1 deletion manageiq-operator/go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/ManageIQ/manageiq-pods/manageiq-operator
module github.com/nasark/manageiq-pods/manageiq-operator

go 1.21

Expand Down
12 changes: 7 additions & 5 deletions manageiq-operator/internal/controller/manageiq_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ 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"
miqkafka "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1/helpers/miq-components/kafka"
miqutilsv1alpha1 "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1/miqutils"
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"
miqkafka "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1/helpers/miq-components/kafka"
miqutilsv1alpha1 "github.com/nasark/manageiq-pods/manageiq-operator/api/v1alpha1/miqutils"
apimeta "k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
Expand Down Expand Up @@ -542,6 +542,8 @@ func (r *ManageIQReconciler) generateKafkaResources(cr *miqv1alpha1.ManageIQ) er
}
}

logger.Info("APP NAME:", "result", cr.Spec.AppName)

kafkaClusterCR, mutateFunc := miqkafka.KafkaCluster(cr, r.Client, r.Scheme)
if result, err := controllerutil.CreateOrUpdate(context.TODO(), r.Client, kafkaClusterCR, mutateFunc); err != nil {
return err
Expand Down
2 changes: 1 addition & 1 deletion manageiq-operator/internal/controller/suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down

0 comments on commit a672017

Please sign in to comment.