Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cleanup password secrets and fix auth #742

Merged
merged 1 commit into from
Oct 31, 2022
Merged

Cleanup password secrets and fix auth #742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 0 additions & 32 deletions apis/ai/v1beta1/opnicluster_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,38 +166,6 @@ type OpensearchUpdateServiceSpec struct {
Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
}

type OpensearchClusterSpec struct {
ExternalOpensearch *opnimeta.OpensearchClusterRef `json:"externalOpensearch"`
Version string `json:"version"`
Workloads OpensearchWorkloadSpec `json:"workloads,omitempty"`
DefaultRepo *string `json:"defaultRepo,omitempty"`
Image *opnimeta.ImageSpec `json:"image,omitempty"`
DashboardsImage *opnimeta.ImageSpec `json:"dashboardsImage,omitempty"`
Persistence *opnimeta.PersistenceSpec `json:"persistence,omitempty"`
EnableLogIndexManagement *bool `json:"enableLogIndexManagement"`
EnableIngestPreprocessing bool `json:"enableIngestPreprocessing,omitempty"`
// Secret containing an item "logging.yml" with the contents of the
// elasticsearch logging config.
ConfigSecret *corev1.LocalObjectReference `json:"configSecret,omitempty"`
// Reference to a secret containing the desired admin password
AdminPasswordFrom *corev1.SecretKeySelector `json:"adminPasswordFrom,omitempty"`
}

type OpensearchWorkloadSpec struct {
Master OpensearchWorkloadOptions `json:"master,omitempty"`
Data OpensearchWorkloadOptions `json:"data,omitempty"`
Client OpensearchWorkloadOptions `json:"client,omitempty"`
Dashboards OpensearchWorkloadOptions `json:"dashboards,omitempty"`
}

type OpensearchWorkloadOptions struct {
Replicas *int32 `json:"replicas,omitempty"`
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
Affinity *corev1.Affinity `json:"affinity,omitempty"`
NodeSelector map[string]string `json:"nodeSelector,omitempty"`
Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
}

type S3Spec struct {
// If set, Opni will deploy an S3 pod to use internally.
// Cannot be set at the same time as `external`.
Expand Down
119 changes: 0 additions & 119 deletions apis/ai/v1beta1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 2 additions & 12 deletions pkg/resources/opnicluster/elastic/indices/indices.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,16 +72,6 @@ func NewReconciler(ctx context.Context, instance interface{}, c client.Client) (
if err := c.Get(ctx, client.ObjectKeyFromObject(reconciler.aiCluster), reconciler.aiCluster); err != nil {
lg.Error(err, "error fetching cluster status, using default password")
}
if reconciler.aiCluster.Status.Auth.OpensearchAuthSecretKeyRef != nil {
secret := &corev1.Secret{}
if err := c.Get(ctx, types.NamespacedName{
Name: reconciler.aiCluster.Status.Auth.OpensearchAuthSecretKeyRef.Name,
Namespace: reconciler.aiCluster.Namespace,
}, secret); err != nil {
lg.Error(err, "error fetching password secret, using default password")
}
password = string(secret.Data[reconciler.aiCluster.Status.Auth.OpensearchAuthSecretKeyRef.Key])
}
reconciler.spec = opnicluster.ConvertSpec(opniCluster.Spec)
reconciler.namespace = opniCluster.Namespace
default:
Expand All @@ -97,12 +87,12 @@ func NewReconciler(ctx context.Context, instance interface{}, c client.Client) (
opensearchCluster := &opensearchv1.OpenSearchCluster{}
err := c.Get(ctx, reconciler.spec.Opensearch.ExternalOpensearch.ObjectKeyFromRef(), opensearchCluster)
if err != nil {
lg.Error(err, "failed to fetch opensearch, index reconciliation will continue with defaults")
return nil, err
}

reconciler.opensearch = opensearchCluster

username, _, err = helpers.UsernameAndPassword(ctx, c, opensearchCluster)
username, password, err = helpers.UsernameAndPassword(ctx, c, opensearchCluster)
if err != nil {
lg.Error(err, "fetching username from opensearch failed")
}
Expand Down
22 changes: 2 additions & 20 deletions pkg/resources/opnicluster/services.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import (
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/client-go/util/retry"
"opensearch.opster.io/pkg/helpers"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
"sigs.k8s.io/controller-runtime/pkg/log"
Expand Down Expand Up @@ -993,23 +992,6 @@ func insertHyperparametersVolume(deployment *appsv1.Deployment, modelName string
}

func (r *Reconciler) externalOpensearchConfig() (retResources []resources.Resource, retErr error) {
_, password, retErr := helpers.UsernameAndPassword(r.ctx, r.client, r.opensearchCluster)
if retErr != nil {
return
}

secret := &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Name: "external-os-password",
Namespace: r.instanceNamespace,
},
StringData: map[string]string{
"password": password,
},
}
ctrl.SetControllerReference(r.opensearchCluster, secret, r.client.Scheme())
retResources = append(retResources, resources.Present(secret))

retErr = retry.RetryOnConflict(retry.DefaultRetry, func() error {
if r.opniCluster != nil {
if err := r.client.Get(r.ctx, client.ObjectKeyFromObject(r.opniCluster), r.opniCluster); err != nil {
Expand All @@ -1018,7 +1000,7 @@ func (r *Reconciler) externalOpensearchConfig() (retResources []resources.Resour
r.opniCluster.Status.Auth.OpensearchAuthSecretKeyRef = &corev1.SecretKeySelector{
Key: "password",
LocalObjectReference: corev1.LocalObjectReference{
Name: secret.Name,
Name: fmt.Sprintf("%s-admin-password", r.opensearchCluster.Name),
},
}
return r.client.Status().Update(r.ctx, r.opniCluster)
Expand All @@ -1030,7 +1012,7 @@ func (r *Reconciler) externalOpensearchConfig() (retResources []resources.Resour
r.aiOpniCluster.Status.Auth.OpensearchAuthSecretKeyRef = &corev1.SecretKeySelector{
Key: "password",
LocalObjectReference: corev1.LocalObjectReference{
Name: secret.Name,
Name: fmt.Sprintf("%s-admin-password", r.opensearchCluster.Name),
},
}
return r.client.Status().Update(r.ctx, r.aiOpniCluster)
Expand Down
2 changes: 1 addition & 1 deletion pkg/resources/opnicluster/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ func ConvertSpec(input aiv1beta1.OpniClusterSpec) v1beta2.OpniClusterSpec {
retSpec.Opensearch = v1beta2.OpensearchClusterSpec{
ExternalOpensearch: input.Opensearch,
EnableLogIndexManagement: lo.ToPtr(false),
EnableIngestPreprocessing: true,
EnableIngestPreprocessing: false,
}
retSpec.DefaultRepo = input.DefaultRepo
retSpec.Version = input.Version
Expand Down
2 changes: 1 addition & 1 deletion pkg/resources/opniopensearch/security.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
)

const (
bcryptCost = 5
bcryptCost = 12
internalUsersKey = "internal_users.yml"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/util/opensearch/opensearch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func NewReconciler(
Addresses: []string{
fmt.Sprintf("https://%s.%s:9200", osServiceName, namespace),
},
Username: "admin",
Username: username,
Password: password,
UseResponseCheckOnly: true,
Transport: transport,
Expand Down