Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
84d8a0b
added db scripts for cluster table
kartik-579 Aug 30, 2023
e4873d2
updated script
kartik-579 Sep 6, 2023
0b1a74a
Merge branch 'main' into cluster-sshTunnel-script
kartik-579 Sep 6, 2023
d3fd49e
renamed script no
kartik-579 Sep 6, 2023
6e26812
Merge branch 'main' into cluster-sshTunnel-script
kartik-579 Sep 13, 2023
b1140c3
changed sql script
kartik-579 Sep 13, 2023
e29fda7
wip
kartik-579 Sep 13, 2023
8a55a1f
updated dependency
kartik-579 Sep 13, 2023
adc82be
wip
kartik-579 Sep 14, 2023
fc872d4
bumped common-lib-version
kartik-579 Sep 14, 2023
f5c02a0
updated vendor
kartik-579 Sep 14, 2023
d10c52d
vendor files
kartik-579 Sep 14, 2023
debd9d3
Merge branch 'main' into cluster-sshTunnel-script
kartik-579 Sep 15, 2023
5219a44
Merge branch 'main' into cluster-sshTunnel-script
kartik-579 Sep 21, 2023
bba8842
updated sql script no.
kartik-579 Sep 21, 2023
5077bb1
Merge branch 'main' into cluster-sshTunnel-script
kartik-579 Sep 22, 2023
ed6d988
added insecureTls connection param in kubelink requests
kartik-579 Sep 25, 2023
f144caf
Merge branch 'main' into cluster-sshTunnel-script
kartik-579 Sep 25, 2023
09e8a8a
updated sql script no.
kartik-579 Sep 25, 2023
94891bb
Merge branch 'main' into cluster-sshTunnel-script
kartik-579 Sep 26, 2023
04a6e96
Merge branch 'main' into cluster-sshTunnel-script
kartik-579 Sep 26, 2023
d3611f0
added argoproj assets
kartik-579 Sep 26, 2023
67ef19c
wip
kartik-579 Sep 26, 2023
19da45d
added argoproj files
kartik-579 Sep 26, 2023
0a5806e
updated .gitignore
kartik-579 Sep 26, 2023
e97ae18
Merge branch 'main' into cluster-sshTunnel-script
kartik-579 Oct 4, 2023
ac2b444
updated sql script no
kartik-579 Oct 4, 2023
61b5e9e
Merge branch 'main' into cluster-sshTunnel-script
kartik-579 Oct 5, 2023
e2c45e5
Merge branch 'main' into cluster-sshTunnel-script
kartik-579 Oct 10, 2023
c24c4fb
Merge branch 'main' into cluster-sshTunnel-script
kartik-579 Oct 10, 2023
2f4fab2
Merge branch 'main' into cluster-sshTunnel-script
kartik-579 Oct 11, 2023
d312daa
updated sql script no
kartik-579 Oct 11, 2023
3d27842
shifted common-lib to major version import
kartik-579 Oct 11, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
.env
/cmd/external-app/devtron-ea
devtron
/vendor/github.com/argoproj/argo-cd/assets
2 changes: 1 addition & 1 deletion Wire.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ package main
import (
"github.com/devtron-labs/authenticator/middleware"
pubsub1 "github.com/devtron-labs/common-lib/pubsub-lib"
util4 "github.com/devtron-labs/common-lib/utils/k8s"
"github.com/devtron-labs/devtron/api/apiToken"
appStoreRestHandler "github.com/devtron-labs/devtron/api/appStore"
chartProvider "github.com/devtron-labs/devtron/api/appStore/chartProvider"
Expand Down Expand Up @@ -122,7 +123,6 @@ import (
repository10 "github.com/devtron-labs/devtron/pkg/variables/repository"
util2 "github.com/devtron-labs/devtron/util"
"github.com/devtron-labs/devtron/util/argo"
util4 "github.com/devtron-labs/devtron/util/k8s"
"github.com/devtron-labs/devtron/util/rbac"
"github.com/google/wire"
)
Expand Down
2 changes: 1 addition & 1 deletion api/appStore/deployment/CommonDeploymentRestHandler.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"context"
"encoding/json"
"fmt"
"github.com/devtron-labs/common-lib/utils/k8sObjectsUtil"
client "github.com/devtron-labs/devtron/api/helm-app"
openapi2 "github.com/devtron-labs/devtron/api/openapi/openapiClient"
"github.com/devtron-labs/devtron/api/restHandler/common"
Expand All @@ -31,7 +32,6 @@ import (
"github.com/devtron-labs/devtron/pkg/user"
"github.com/devtron-labs/devtron/pkg/user/casbin"
util2 "github.com/devtron-labs/devtron/util"
"github.com/devtron-labs/devtron/util/k8sObjectsUtil"
"github.com/devtron-labs/devtron/util/rbac"
"github.com/gorilla/mux"
"go.opentelemetry.io/otel"
Expand Down
2 changes: 1 addition & 1 deletion api/cluster/EnvironmentRestHandler.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ package cluster
import (
"context"
"encoding/json"
k8s2 "github.com/devtron-labs/common-lib/utils/k8s"
"github.com/devtron-labs/devtron/pkg/k8s"
k8s2 "github.com/devtron-labs/devtron/util/k8s"
"net/http"
"strconv"
"strings"
Expand Down
2 changes: 1 addition & 1 deletion api/helm-app/HelmAppRestHandler.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"encoding/json"
"errors"
"github.com/devtron-labs/common-lib/utils/k8sObjectsUtil"
openapi "github.com/devtron-labs/devtron/api/helm-app/openapiClient"
openapi2 "github.com/devtron-labs/devtron/api/openapi/openapiClient"
"github.com/devtron-labs/devtron/api/restHandler/common"
Expand All @@ -14,7 +15,6 @@ import (
serverEnvConfig "github.com/devtron-labs/devtron/pkg/server/config"
"github.com/devtron-labs/devtron/pkg/user"
"github.com/devtron-labs/devtron/pkg/user/casbin"
"github.com/devtron-labs/devtron/util/k8sObjectsUtil"
"github.com/devtron-labs/devtron/util/rbac"
"github.com/gorilla/mux"
"go.uber.org/zap"
Expand Down
30 changes: 21 additions & 9 deletions api/helm-app/HelmAppService.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"errors"
"fmt"
"github.com/devtron-labs/common-lib/utils/k8s"
repository2 "github.com/devtron-labs/devtron/internal/sql/repository/dockerRegistry"
"github.com/devtron-labs/devtron/util/k8s"
"net/http"
"reflect"
"strconv"
Expand Down Expand Up @@ -137,10 +137,16 @@ func (impl *HelmAppServiceImpl) listApplications(ctx context.Context, clusterIds
req := &AppListRequest{}
for _, clusterDetail := range clusters {
config := &ClusterConfig{
ApiServerUrl: clusterDetail.ServerUrl,
Token: clusterDetail.Config[k8s.BearerToken],
ClusterId: int32(clusterDetail.Id),
ClusterName: clusterDetail.ClusterName,
ApiServerUrl: clusterDetail.ServerUrl,
Token: clusterDetail.Config[k8s.BearerToken],
ClusterId: int32(clusterDetail.Id),
ClusterName: clusterDetail.ClusterName,
InsecureSkipTLSVerify: clusterDetail.InsecureSkipTLSVerify,
}
if clusterDetail.InsecureSkipTLSVerify == false {
config.KeyData = clusterDetail.Config[k8s.TlsKey]
config.CertData = clusterDetail.Config[k8s.CertData]
config.CaData = clusterDetail.Config[k8s.CertificateAuthorityData]
}
req.Clusters = append(req.Clusters, config)
}
Expand Down Expand Up @@ -262,10 +268,16 @@ func (impl *HelmAppServiceImpl) GetClusterConf(clusterId int) (*ClusterConfig, e
return nil, err
}
config := &ClusterConfig{
ApiServerUrl: cluster.ServerUrl,
Token: cluster.Config[k8s.BearerToken],
ClusterId: int32(cluster.Id),
ClusterName: cluster.ClusterName,
ApiServerUrl: cluster.ServerUrl,
Token: cluster.Config[k8s.BearerToken],
ClusterId: int32(cluster.Id),
ClusterName: cluster.ClusterName,
InsecureSkipTLSVerify: cluster.InsecureSkipTLSVerify,
}
if cluster.InsecureSkipTLSVerify == false {
config.KeyData = cluster.Config[k8s.TlsKey]
config.CertData = cluster.Config[k8s.CertData]
config.CaData = cluster.Config[k8s.CertificateAuthorityData]
}
return config, nil
}
Expand Down
1,090 changes: 565 additions & 525 deletions api/helm-app/applist.pb.go

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions api/helm-app/applist.proto
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ message ClusterConfig {
string token = 2;
int32 clusterId = 3;
string clusterName = 4;
bool insecureSkipTLSVerify = 5;
string keyData = 6;
string certData = 7;
string caData = 8;
}

message AppListRequest {
Expand Down
Loading