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

postgres: Add naisjob fallback #346

Merged
merged 1 commit into from
Feb 28, 2024
Merged

postgres: Add naisjob fallback #346

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
50 changes: 46 additions & 4 deletions pkg/postgres/dbinfo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
"fmt"
"strings"

naisv1 "github.com/nais/liberator/pkg/apis/nais.io/v1"
naisalpha1 "github.com/nais/liberator/pkg/apis/nais.io/v1alpha1"
"golang.org/x/oauth2"

corev1 "k8s.io/api/core/v1"

naisalpha1 "github.com/nais/liberator/pkg/apis/nais.io/v1alpha1"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"
Expand Down Expand Up @@ -161,7 +161,10 @@ func (i *DBInfo) fetchSQLDatabases(ctx context.Context) error {
Resource: "applications",
}).Namespace(i.namespace).Get(ctx, i.appName, v1.GetOptions{})
if err != nil {
return fmt.Errorf("fetchSQLDatabases: unable to get application %q in %q: %w", i.appName, i.namespace, err)
if k8serrors.IsNotFound(err) {
return i.fetchDBInstanceFromJob(ctx)
}
return fmt.Errorf("fetchSQLDatabases: unable to get application or naisjob %q in %q: %w", i.appName, i.namespace, err)
}

if err := runtime.DefaultUnstructuredConverter.FromUnstructured(u.Object, app); err != nil {
Expand Down Expand Up @@ -192,6 +195,45 @@ func (i *DBInfo) fetchSQLDatabases(ctx context.Context) error {
return fmt.Errorf("database %q not found for app %q in %q", i.databaseName, i.appName, i.namespace)
}

func (i *DBInfo) fetchDBInstanceFromJob(ctx context.Context) error {
job := &naisv1.Naisjob{}
u, err := i.dynamicClient.Resource(schema.GroupVersionResource{
Group: "nais.io",
Version: "v1",
Resource: "naisjobs",
}).Namespace(i.namespace).Get(ctx, i.appName, v1.GetOptions{})
if err != nil {
return fmt.Errorf("fetchSQLDatabases: unable to get application or naisjob %q in %q: %w", i.appName, i.namespace, err)
}

if err := runtime.DefaultUnstructuredConverter.FromUnstructured(u.Object, job); err != nil {
return fmt.Errorf("fetchSQLDatabases: unable to convert unstructured to application: %w", err)
}

if job.Spec.GCP != nil && len(job.Spec.GCP.SqlInstances) != 1 {
return fmt.Errorf("fetchSQLDatabases: expected exactly one sqlinstance, found %d", len(job.Spec.GCP.SqlInstances))
}

if len(job.Spec.GCP.SqlInstances[0].Databases) == 1 {
return nil
}

if i.databaseName == "" {
return fmt.Errorf("multiple databases found for app %q in %q, please specify one using the --database flag", i.appName, i.namespace)
}

for _, db := range job.Spec.GCP.SqlInstances[0].Databases {
if db.Name == i.databaseName {
i.multiDB = true
i.instanceName = job.Spec.GCP.SqlInstances[0].Name
i.user = db.Users[0].Name
return nil
}
}

return fmt.Errorf("database %q not found for app %q in %q", i.databaseName, i.appName, i.namespace)
}

func (i *DBInfo) fetchDBInstance(ctx context.Context) error {
sqlInstances, err := i.dynamicClient.Resource(schema.GroupVersionResource{
Group: "sql.cnrm.cloud.google.com",
Expand Down