Skip to content

Commit

Permalink
Fix patch
Browse files Browse the repository at this point in the history
  • Loading branch information
@mrMigles
mrMigles authored and seiv0814 committed Nov 15, 2024
1 parent 8af4571 commit 63414a0
Show file tree
Hide file tree
Showing 17 changed files with 48 additions and 48 deletions.
12 changes: 6 additions & 6 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ DRD extension is a golang application which starts server and controller with fu
## Extension Repository
1. Make a repository or folder for your golang application.
2. In `go.mod` add import `git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon` with actual [version](https://git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/-/tags).
2. In `go.mod` add import `github.com/Netcracker/disaster-recovery-daemon` with actual [version](https://github.com/Netcracker/disaster-recovery-daemon/-/tags).
3. Implement `Main.go` which starts server and controller with function which implements custom DR logic and custom health check logic.
4. Build a Docker image with your golang application.
5. Add a new deployment or container for DRD application to your Helm chart, with corresponding [environment variables](#environment-variables).
Expand Down Expand Up @@ -332,11 +332,11 @@ package main
import (
"context"
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/api/entity"
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/client"
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/config"
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/controller"
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/server"
"github.com/Netcracker/disaster-recovery-daemon/api/entity"
"github.com/Netcracker/disaster-recovery-daemon/client"
"github.com/Netcracker/disaster-recovery-daemon/config"
"github.com/Netcracker/disaster-recovery-daemon/controller"
"github.com/Netcracker/disaster-recovery-daemon/server"
"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand Down
4 changes: 2 additions & 2 deletions ...o build git.netcracker.com_PROD.Platform.Streaming_disaster-recovery-daemon__demo.run.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="go build git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/_demo" type="GoApplicationRunConfiguration" factoryName="Go Application" nameIsGenerated="true">
<configuration default="false" name="go build github.com/Netcracker/disaster-recovery-daemon/_demo" type="GoApplicationRunConfiguration" factoryName="Go Application" nameIsGenerated="true">
<module name="disaster-recovery-daemon" />
<working_directory value="$PROJECT_DIR$" />
<parameters value="--kubeconfig $PROJECT_DIR$/_demo/kubeconfig" />
Expand All @@ -18,7 +18,7 @@
<env name="USE_DEFAULT_PATHS" value="false" />
</envs>
<kind value="PACKAGE" />
<package value="git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/_demo" />
<package value="github.com/Netcracker/disaster-recovery-daemon/_demo" />
<directory value="$PROJECT_DIR$" />
<method v="2" />
</configuration>
Expand Down
10 changes: 5 additions & 5 deletions _demo/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ package main

import (
"context"
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/api/entity"
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/client"
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/config"
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/controller"
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/server"
"github.com/Netcracker/disaster-recovery-daemon/api/entity"
"github.com/Netcracker/disaster-recovery-daemon/client"
"github.com/Netcracker/disaster-recovery-daemon/config"
"github.com/Netcracker/disaster-recovery-daemon/controller"
"github.com/Netcracker/disaster-recovery-daemon/server"
"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand Down
6 changes: 3 additions & 3 deletions cmd/main.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package main

import (
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/config"
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/server"
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/utils"
"github.com/Netcracker/disaster-recovery-daemon/config"
"github.com/Netcracker/disaster-recovery-daemon/server"
"github.com/Netcracker/disaster-recovery-daemon/utils"
"log"
"log/slog"
"os"
Expand Down
2 changes: 1 addition & 1 deletion config/types.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package config

import "git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/api/entity"
import "github.com/Netcracker/disaster-recovery-daemon/api/entity"

const (
RequiredEnvTemplatedError = "the environment variable '%s' must not be empty"
Expand Down
10 changes: 5 additions & 5 deletions controller/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
"strconv"
"time"

"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/api/entity"
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/client"
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/config"
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/internal/usecase"
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/internal/usecase/repo"
"github.com/Netcracker/disaster-recovery-daemon/api/entity"
"github.com/Netcracker/disaster-recovery-daemon/client"
"github.com/Netcracker/disaster-recovery-daemon/config"
"github.com/Netcracker/disaster-recovery-daemon/internal/usecase"
"github.com/Netcracker/disaster-recovery-daemon/internal/usecase/repo"
"github.com/avast/retry-go/v4"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
Expand Down
6 changes: 3 additions & 3 deletions controller/controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package controller

import (
"fmt"
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/api/entity"
repoConfig "git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/config"
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/internal/usecase"
"github.com/Netcracker/disaster-recovery-daemon/api/entity"
repoConfig "github.com/Netcracker/disaster-recovery-daemon/config"
"github.com/Netcracker/disaster-recovery-daemon/internal/usecase"
"github.com/stretchr/testify/assert"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/watch"
Expand Down
12 changes: 6 additions & 6 deletions internal/app/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ import (
"crypto/x509"
"errors"
"fmt"
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/client"
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/config"
v1 "git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/internal/controller/http/v1"
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/internal/usecase"
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/internal/usecase/repo"
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/pkg/httpserver"
"github.com/Netcracker/disaster-recovery-daemon/client"
"github.com/Netcracker/disaster-recovery-daemon/config"
v1 "github.com/Netcracker/disaster-recovery-daemon/internal/controller/http/v1"
"github.com/Netcracker/disaster-recovery-daemon/internal/usecase"
"github.com/Netcracker/disaster-recovery-daemon/internal/usecase/repo"
"github.com/Netcracker/disaster-recovery-daemon/pkg/httpserver"
"k8s.io/apimachinery/pkg/runtime/schema"
"net/http"
"os"
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/http/v1/authentication.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package v1
import (
"context"
"fmt"
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/config"
"github.com/Netcracker/disaster-recovery-daemon/config"
v1 "k8s.io/api/authentication/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/http/v1/routes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package v1
import (
"encoding/json"
"fmt"
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/api/entity"
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/internal/usecase"
"github.com/Netcracker/disaster-recovery-daemon/api/entity"
"github.com/Netcracker/disaster-recovery-daemon/internal/usecase"
"github.com/gorilla/handlers"
"github.com/gorilla/mux"
"io"
Expand Down
4 changes: 2 additions & 2 deletions internal/usecase/health.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package usecase
import (
"encoding/json"
"fmt"
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/api/entity"
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/config"
"github.com/Netcracker/disaster-recovery-daemon/api/entity"
"github.com/Netcracker/disaster-recovery-daemon/config"
"log"
"net/http"
"strings"
Expand Down
4 changes: 2 additions & 2 deletions internal/usecase/interfaces.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package usecase

import (
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/api/entity"
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/config"
"github.com/Netcracker/disaster-recovery-daemon/api/entity"
"github.com/Netcracker/disaster-recovery-daemon/config"
"io"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/usecase/readMode.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package usecase

import (
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/api/entity"
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/config"
"github.com/Netcracker/disaster-recovery-daemon/api/entity"
"github.com/Netcracker/disaster-recovery-daemon/config"
)

func NewReadModeUseCase(crr KubernetesCustomResourceRepo, config config.DisasterRecoveryPath) *ReadModeUseCase {
Expand Down
4 changes: 2 additions & 2 deletions internal/usecase/repo/kubernetesCustomResourceRepo.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package repo

import (
"context"
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/api/entity"
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/config"
"github.com/Netcracker/disaster-recovery-daemon/api/entity"
"github.com/Netcracker/disaster-recovery-daemon/config"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
Expand Down
2 changes: 1 addition & 1 deletion internal/usecase/repo/kubernetesRepo.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package repo

import (
"context"
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/api/entity"
"github.com/Netcracker/disaster-recovery-daemon/api/entity"
appsv1 "k8s.io/api/apps/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
Expand Down
4 changes: 2 additions & 2 deletions internal/usecase/setMode.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package usecase
import (
"errors"
"fmt"
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/api/entity"
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/config"
"github.com/Netcracker/disaster-recovery-daemon/api/entity"
"github.com/Netcracker/disaster-recovery-daemon/config"
"strconv"
"time"
)
Expand Down
6 changes: 3 additions & 3 deletions server/server.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package server

import (
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/api/entity"
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/config"
"git.netcracker.com/PROD.Platform.Streaming/disaster-recovery-daemon/internal/app"
"github.com/Netcracker/disaster-recovery-daemon/api/entity"
"github.com/Netcracker/disaster-recovery-daemon/config"
"github.com/Netcracker/disaster-recovery-daemon/internal/app"
"log"
)

Expand Down

0 comments on commit 63414a0

Please sign in to comment.