Skip to content

Commit

Permalink
Merge pull request #126 from tarilabs/tarilabs-20240923-sync
Browse files Browse the repository at this point in the history 
periodic sync upstream KF to midstream ODH
  • Loading branch information
@openshift-merge-bot
openshift-merge-bot[bot] authored Sep 23, 2024
2 parents 87d0901 + a705dd1 commit 8d8f2e6
Show file tree
Hide file tree
Showing 38 changed files with 30 additions and 36 deletions.
9 changes: 2 additions & 7 deletions clients/ui/bff/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,8 @@ COPY go.mod go.sum ./
RUN go mod download

# Copy the go source files
COPY cmd/ cmd/
COPY api/ api/
COPY config/ config/
COPY data/ data/
COPY integrations/ integrations/
COPY internals/ internals/
COPY validation/ validation/
COPY cmd/main.go cmd/main.go
COPY internal/ internal/



Expand Down
4 changes: 2 additions & 2 deletions clients/ui/bff/cmd/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package main
import (
"flag"
"fmt"
"github.com/kubeflow/model-registry/ui/bff/api"
"github.com/kubeflow/model-registry/ui/bff/config"
"github.com/kubeflow/model-registry/ui/bff/internal/api"
"github.com/kubeflow/model-registry/ui/bff/internal/config"

"log/slog"
"net/http"
Expand Down
8 changes: 4 additions & 4 deletions clients/ui/bff/api/app.go → clients/ui/bff/internal/api/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ package api

import (
"fmt"
"github.com/kubeflow/model-registry/ui/bff/internal/config"
"github.com/kubeflow/model-registry/ui/bff/internal/data"
"github.com/kubeflow/model-registry/ui/bff/internal/integrations"
"log/slog"
"net/http"

"github.com/julienschmidt/httprouter"
"github.com/kubeflow/model-registry/ui/bff/config"
"github.com/kubeflow/model-registry/ui/bff/data"
"github.com/kubeflow/model-registry/ui/bff/integrations"
"github.com/kubeflow/model-registry/ui/bff/internals/mocks"
"github.com/kubeflow/model-registry/ui/bff/internal/mocks"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion clients/ui/bff/api/errors.go → clients/ui/bff/internal/api/errors.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package api
import (
"encoding/json"
"fmt"
"github.com/kubeflow/model-registry/ui/bff/integrations"
"github.com/kubeflow/model-registry/ui/bff/internal/integrations"
"net/http"
"strconv"
)
Expand Down
4 changes: 2 additions & 2 deletions ...s/ui/bff/api/healthcheck__handler_test.go → ...internal/api/healthcheck__handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package api

import (
"encoding/json"
"github.com/kubeflow/model-registry/ui/bff/config"
"github.com/kubeflow/model-registry/ui/bff/data"
"github.com/kubeflow/model-registry/ui/bff/internal/config"
"github.com/kubeflow/model-registry/ui/bff/internal/data"
"github.com/stretchr/testify/assert"
"io"
"net/http"
Expand Down
0 clients/ui/bff/api/healthcheck_handler.go → ...i/bff/internal/api/healthcheck_handler.go
View file
File renamed without changes.
0 clients/ui/bff/api/helpers.go → clients/ui/bff/internal/api/helpers.go
View file
File renamed without changes.
0 clients/ui/bff/api/helpers_test.go → clients/ui/bff/internal/api/helpers_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion clients/ui/bff/api/middleware.go → clients/ui/bff/internal/api/middleware.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"fmt"
"github.com/julienschmidt/httprouter"
"github.com/kubeflow/model-registry/ui/bff/integrations"
"github.com/kubeflow/model-registry/ui/bff/internal/integrations"
"k8s.io/client-go/rest"
"net/http"
)
Expand Down
2 changes: 1 addition & 1 deletion clients/ui/bff/api/model_registry_handler.go → ...ff/internal/api/model_registry_handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package api

import (
"github.com/julienschmidt/httprouter"
"github.com/kubeflow/model-registry/ui/bff/data"
"github.com/kubeflow/model-registry/ui/bff/internal/data"
"net/http"
)

Expand Down
4 changes: 2 additions & 2 deletions ...ui/bff/api/model_registry_handler_test.go → ...ternal/api/model_registry_handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package api

import (
"encoding/json"
"github.com/kubeflow/model-registry/ui/bff/data"
"github.com/kubeflow/model-registry/ui/bff/internals/mocks"
"github.com/kubeflow/model-registry/ui/bff/internal/data"
"github.com/kubeflow/model-registry/ui/bff/internal/mocks"
"github.com/stretchr/testify/assert"
"io"
"net/http"
Expand Down
4 changes: 2 additions & 2 deletions clients/ui/bff/api/model_versions_handler.go → ...ff/internal/api/model_versions_handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"fmt"
"github.com/julienschmidt/httprouter"
"github.com/kubeflow/model-registry/pkg/openapi"
"github.com/kubeflow/model-registry/ui/bff/integrations"
"github.com/kubeflow/model-registry/ui/bff/validation"
"github.com/kubeflow/model-registry/ui/bff/internal/integrations"
"github.com/kubeflow/model-registry/ui/bff/internal/validation"
"net/http"
)

Expand Down
2 changes: 1 addition & 1 deletion ...ui/bff/api/model_versions_handler_test.go → ...ternal/api/model_versions_handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package api

import (
"github.com/kubeflow/model-registry/pkg/openapi"
"github.com/kubeflow/model-registry/ui/bff/internals/mocks"
"github.com/kubeflow/model-registry/ui/bff/internal/mocks"
"github.com/stretchr/testify/assert"
"net/http"
"testing"
Expand Down
4 changes: 2 additions & 2 deletions ...s/ui/bff/api/registered_models_handler.go → ...internal/api/registered_models_handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import (
"encoding/json"
"errors"
"fmt"
"github.com/kubeflow/model-registry/ui/bff/internal/integrations"
"github.com/kubeflow/model-registry/ui/bff/internal/validation"
"net/http"

"github.com/julienschmidt/httprouter"
"github.com/kubeflow/model-registry/pkg/openapi"
"github.com/kubeflow/model-registry/ui/bff/integrations"
"github.com/kubeflow/model-registry/ui/bff/validation"
)

type RegisteredModelEnvelope Envelope[*openapi.RegisteredModel, None]
Expand Down
2 changes: 1 addition & 1 deletion ...bff/api/registered_models_handler_test.go → ...nal/api/registered_models_handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package api

import (
"github.com/kubeflow/model-registry/pkg/openapi"
"github.com/kubeflow/model-registry/ui/bff/internals/mocks"
"github.com/kubeflow/model-registry/ui/bff/internal/mocks"
"github.com/stretchr/testify/assert"
"net/http"
"testing"
Expand Down
2 changes: 1 addition & 1 deletion clients/ui/bff/api/test_utils.go → clients/ui/bff/internal/api/test_utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"bytes"
"context"
"encoding/json"
"github.com/kubeflow/model-registry/ui/bff/internals/mocks"
"github.com/kubeflow/model-registry/ui/bff/internal/mocks"
"io"
"net/http"
"net/http/httptest"
Expand Down
0 clients/ui/bff/config/environment.go → ...nts/ui/bff/internal/config/environment.go
View file
File renamed without changes.
0 clients/ui/bff/data/health_check_model.go → ...i/bff/internal/data/health_check_model.go
View file
File renamed without changes.
3 changes: 1 addition & 2 deletions clients/ui/bff/data/model_registry.go → ...ts/ui/bff/internal/data/model_registry.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ package data

import (
"fmt"

k8s "github.com/kubeflow/model-registry/ui/bff/integrations"
k8s "github.com/kubeflow/model-registry/ui/bff/internal/integrations"
)

type ModelRegistryModel struct {
Expand Down
0 clients/ui/bff/data/model_registry_client.go → ...ff/internal/data/model_registry_client.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion clients/ui/bff/data/model_registry_test.go → .../bff/internal/data/model_registry_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package data

import (
"github.com/kubeflow/model-registry/ui/bff/internals/mocks"
"github.com/kubeflow/model-registry/ui/bff/internal/mocks"
"github.com/stretchr/testify/assert"
"testing"
)
Expand Down
2 changes: 1 addition & 1 deletion clients/ui/bff/data/model_version.go → ...nts/ui/bff/internal/data/model_version.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"encoding/json"
"fmt"
"github.com/kubeflow/model-registry/pkg/openapi"
"github.com/kubeflow/model-registry/ui/bff/integrations"
"github.com/kubeflow/model-registry/ui/bff/internal/integrations"
"net/url"
)

Expand Down
2 changes: 1 addition & 1 deletion clients/ui/bff/data/model_version_test.go → ...i/bff/internal/data/model_version_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package data
import (
"encoding/json"
"github.com/brianvoe/gofakeit/v7"
"github.com/kubeflow/model-registry/ui/bff/internals/mocks"
"github.com/kubeflow/model-registry/ui/bff/internal/mocks"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"net/http"
Expand Down
0 clients/ui/bff/data/models.go → clients/ui/bff/internal/data/models.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion clients/ui/bff/data/registered_model.go → .../ui/bff/internal/data/registered_model.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"encoding/json"
"fmt"
"github.com/kubeflow/model-registry/pkg/openapi"
"github.com/kubeflow/model-registry/ui/bff/integrations"
"github.com/kubeflow/model-registry/ui/bff/internal/integrations"
"net/url"
)

Expand Down
2 changes: 1 addition & 1 deletion clients/ui/bff/data/registered_model_test.go → ...ff/internal/data/registered_model_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package data
import (
"encoding/json"
"github.com/brianvoe/gofakeit/v7"
"github.com/kubeflow/model-registry/ui/bff/internals/mocks"
"github.com/kubeflow/model-registry/ui/bff/internal/mocks"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"net/http"
Expand Down
0 clients/ui/bff/integrations/constants.go → ...ui/bff/internal/integrations/constants.go
View file
File renamed without changes.
0 clients/ui/bff/integrations/http.go → clients/ui/bff/internal/integrations/http.go
View file
File renamed without changes.
0 clients/ui/bff/integrations/k8s.go → clients/ui/bff/internal/integrations/k8s.go
View file
File renamed without changes.
0 clients/ui/bff/integrations/k8s_test.go → .../ui/bff/internal/integrations/k8s_test.go
View file
File renamed without changes.
0 clients/ui/bff/internals/mocks/http_mock.go → clients/ui/bff/internal/mocks/http_mock.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion clients/ui/bff/internals/mocks/k8s_mock.go → clients/ui/bff/internal/mocks/k8s_mock.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package mocks

import (
k8s "github.com/kubeflow/model-registry/ui/bff/integrations"
k8s "github.com/kubeflow/model-registry/ui/bff/internal/integrations"
"github.com/stretchr/testify/mock"
"log/slog"
)
Expand Down
2 changes: 1 addition & 1 deletion ...rnals/mocks/model_registry_client_mock.go → ...ernal/mocks/model_registry_client_mock.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package mocks

import (
"github.com/kubeflow/model-registry/pkg/openapi"
"github.com/kubeflow/model-registry/ui/bff/integrations"
"github.com/kubeflow/model-registry/ui/bff/internal/integrations"
"github.com/stretchr/testify/mock"
"log/slog"
)
Expand Down
0 ...i/bff/internals/mocks/static_data_mock.go → ...ui/bff/internal/mocks/static_data_mock.go
View file
File renamed without changes.
0 clients/ui/bff/internals/mocks/types_mock.go → clients/ui/bff/internal/mocks/types_mock.go
View file
File renamed without changes.
0 clients/ui/bff/validation/test_helpers.go → ...i/bff/internal/validation/test_helpers.go
View file
File renamed without changes.
0 clients/ui/bff/validation/validation.go → .../ui/bff/internal/validation/validation.go
View file
File renamed without changes.
0 clients/ui/bff/validation/validation_test.go → ...ff/internal/validation/validation_test.go
View file
File renamed without changes.

0 comments on commit 8d8f2e6

Please sign in to comment.