Skip to content

Commit

Permalink
fix: change dns server (#74)
Browse files Browse the repository at this point in the history 
* fix: change dns server

* fix: change dns server
  • Loading branch information
@DokiDoki1103
DokiDoki1103 authored Aug 25, 2023
1 parent 48cfc6b commit 1edb9a4
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 21 deletions.
6 changes: 3 additions & 3 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/go-playground/validator/v10 v10.5.0
github.com/go-sql-driver/mysql v1.6.0
github.com/goodrain/rainbond v0.0.0-00010101000000-000000000000
github.com/goodrain/rainbond-operator v1.3.1-0.20210401055914-f8fe4bf89a21
github.com/goodrain/rainbond-operator v1.3.1-0.20230824023738-77dcd7cc53b7
github.com/google/wire v0.5.0
github.com/helm/helm v2.17.0+incompatible
github.com/nsqio/go-nsq v1.0.8
Expand Down Expand Up @@ -52,7 +52,7 @@ require (
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
github.com/Masterminds/squirrel v1.5.3 // indirect
github.com/Microsoft/go-winio v0.5.2 // indirect
github.com/Microsoft/hcsshim v0.9.3 // indirect
github.com/Microsoft/hcsshim v0.9.4 // indirect
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/apparentlymart/go-cidr v1.0.1 // indirect
Expand Down Expand Up @@ -144,7 +144,7 @@ require (
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
github.com/opencontainers/runc v1.1.3 // indirect
github.com/opencontainers/runc v1.1.4 // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.12.1 // indirect
Expand Down
6 changes: 6 additions & 0 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ github.com/Microsoft/hcsshim v0.8.24/go.mod h1:4zegtUJth7lAvFyc6cH2gGQ5B3OFQim01
github.com/Microsoft/hcsshim v0.9.2/go.mod h1:7pLA8lDk46WKDWlVsENo92gC0XFa8rbKfyFRBqxEbCc=
github.com/Microsoft/hcsshim v0.9.3 h1:k371PzBuRrz2b+ebGuI2nVgVhgsVX60jMfSw80NECxo=
github.com/Microsoft/hcsshim v0.9.3/go.mod h1:7pLA8lDk46WKDWlVsENo92gC0XFa8rbKfyFRBqxEbCc=
github.com/Microsoft/hcsshim v0.9.4 h1:mnUj0ivWy6UzbB1uLFqKR6F+ZyiDc7j4iGgHTpO+5+I=
github.com/Microsoft/hcsshim v0.9.4/go.mod h1:7pLA8lDk46WKDWlVsENo92gC0XFa8rbKfyFRBqxEbCc=
github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da/go.mod h1:5hlzMzRKMLyo42nCZ9oml8AdTlq/0cvIaBv6tK1RehU=
github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod h1:mw7qgWloBUl75W/gVH3cQszUg1+gUITj7D6NY7ywVnY=
github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
Expand Down Expand Up @@ -799,6 +801,8 @@ github.com/gomodule/redigo v1.8.2/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUz
github.com/goodrain/rainbond-oam v0.0.0-20210206075623-511d0796af43/go.mod h1:/dRehR3e1pGexOaIDjA44AHBlVPbb7v+O7GWAVyo740=
github.com/goodrain/rainbond-operator v1.3.1-0.20210401055914-f8fe4bf89a21 h1:iCPI96slvJv88iPc1NJW8zhpkiza0kwB0jtsuZIJLRQ=
github.com/goodrain/rainbond-operator v1.3.1-0.20210401055914-f8fe4bf89a21/go.mod h1:jcQfNoxO67nkLalCmgihYrdWF82TKyuPW032tgGdqVY=
github.com/goodrain/rainbond-operator v1.3.1-0.20230824023738-77dcd7cc53b7 h1:W/Y6ISlKA8y3Bc8SN9Yig6S7IvxoyyKWUYblRTStrmE=
github.com/goodrain/rainbond-operator v1.3.1-0.20230824023738-77dcd7cc53b7/go.mod h1:znW3nNsoF0UBNYCbY5cct+gBFJkShaeuHaFzn498qQo=
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
Expand Down Expand Up @@ -1362,6 +1366,8 @@ github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04s
github.com/opencontainers/runc v1.1.0/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc=
github.com/opencontainers/runc v1.1.3 h1:vIXrkId+0/J2Ymu2m7VjGvbSlAId9XNRPhn2p4b+d8w=
github.com/opencontainers/runc v1.1.3/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg=
github.com/opencontainers/runc v1.1.4 h1:nRCz/8sKg6K6jgYAFLDlXzPeITBZJyX28DBVhWD+5dg=
github.com/opencontainers/runc v1.1.4/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg=
github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
github.com/opencontainers/runtime-spec v1.0.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
Expand Down
24 changes: 6 additions & 18 deletions internal/operator/rainbond_region_init.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import (
"github.com/goodrain/rainbond-operator/util/commonutil"
"github.com/goodrain/rainbond-operator/util/constants"
"github.com/goodrain/rainbond-operator/util/rbdutil"
"github.com/goodrain/rainbond-operator/util/retryutil"
"github.com/goodrain/rainbond-operator/util/suffixdomain"
"github.com/sirupsen/logrus"
"goodrain.com/cloud-adaptor/internal/adaptor/v1alpha1"
Expand Down Expand Up @@ -62,14 +61,14 @@ func init() {
}
}

//RainbondRegionInit rainbond region init by operator
// RainbondRegionInit rainbond region init by operator
type RainbondRegionInit struct {
kubeconfig v1alpha1.KubeConfig
namespace string
rainbondClusterConfigRepo repo.RainbondClusterConfigRepository
}

//NewRainbondRegionInit new
// NewRainbondRegionInit new
func NewRainbondRegionInit(kubeconfig v1alpha1.KubeConfig, rainbondClusterConfigRepo repo.RainbondClusterConfigRepository) *RainbondRegionInit {
return &RainbondRegionInit{
kubeconfig: kubeconfig,
Expand All @@ -78,7 +77,7 @@ func NewRainbondRegionInit(kubeconfig v1alpha1.KubeConfig, rainbondClusterConfig
}
}

//InitRainbondRegion init rainbond region
// InitRainbondRegion init rainbond region
func (r *RainbondRegionInit) InitRainbondRegion(initConfig *v1alpha1.RainbondInitConfig) error {
clusterID := initConfig.ClusterID
kubeconfigFileName := "/tmp/" + clusterID + ".kubeconfig"
Expand Down Expand Up @@ -290,18 +289,7 @@ func (r *RainbondRegionInit) createRainbondCR(kubeClient *kubernetes.Clientset,
ip = initConfig.EIPs[0]
}
if ip != "" {
err := retryutil.Retry(1*time.Second, 3, func() (bool, error) {
domain, err := r.genSuffixHTTPHost(kubeClient, ip)
if err != nil {
return false, err
}
cluster.Spec.SuffixHTTPHost = domain
return true, nil
})
if err != nil {
logrus.Warningf("generate suffix http host: %v", err)
cluster.Spec.SuffixHTTPHost = constants.DefHTTPDomainSuffix
}
cluster.Spec.SuffixHTTPHost = ip + rbdutil.GetenvDefault("DNS_SERVER", ".nip.io")
} else {
cluster.Spec.SuffixHTTPHost = constants.DefHTTPDomainSuffix
}
Expand Down Expand Up @@ -367,7 +355,7 @@ func generateSuffixConfigMap(name, namespace string) *v1.ConfigMap {
return cm
}

//GetRainbondRegionStatus get rainbond region status
// GetRainbondRegionStatus get rainbond region status
func (r *RainbondRegionInit) GetRainbondRegionStatus(clusterID string) (*v1alpha1.RainbondRegionStatus, error) {
coreClient, rainbondClient, err := r.kubeconfig.GetKubeClient()
if err != nil {
Expand Down Expand Up @@ -429,7 +417,7 @@ func (r *RainbondRegionInit) GetRainbondRegionStatus(clusterID string) (*v1alpha
return status, nil
}

//UninstallRegion uninstall
// UninstallRegion uninstall
func (r *RainbondRegionInit) UninstallRegion(clusterID string) error {
deleteOpts := metav1.DeleteOptions{
GracePeriodSeconds: commonutil.Int64(0),
Expand Down

0 comments on commit 1edb9a4

Please sign in to comment.