Skip to content

Commit

Permalink
test ManageIQ#2
Browse files Browse the repository at this point in the history
  • Loading branch information
@nasark
nasark committed Sep 26, 2023
1 parent 632c182 commit d678aea
Show file tree
Hide file tree
Showing 19 changed files with 28 additions and 28 deletions.
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"
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"
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"
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"
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"
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"
Expand Down
4 changes: 2 additions & 2 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"
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"
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
2 changes: 1 addition & 1 deletion manageiq-operator/api/v1alpha1/helpers/miq-components/kafka.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"
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"
Expand Down
8 changes: 4 additions & 4 deletions manageiq-operator/api/v1alpha1/helpers/miq-components/memcached.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"
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"
Expand Down Expand Up @@ -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
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"
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"
Expand Down
2 changes: 1 addition & 1 deletion manageiq-operator/api/v1alpha1/helpers/miq-components/operator.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"
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"
Expand Down
2 changes: 1 addition & 1 deletion manageiq-operator/api/v1alpha1/helpers/miq-components/orchestrator.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"
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"
Expand Down
2 changes: 1 addition & 1 deletion manageiq-operator/api/v1alpha1/helpers/miq-components/postgresql.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"
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"
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"
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"
Expand Down
2 changes: 1 addition & 1 deletion manageiq-operator/api/v1alpha1/helpers/miq-components/utils/util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
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 @@ -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
)

Expand Down
6 changes: 3 additions & 3 deletions manageiq-operator/internal/controller/manageiq_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
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 d678aea

Please sign in to comment.