Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
1105 Внедрение механизмов обеспечения безопасности цепочки поставки программных проектов
Legacy
scanned-projects
helm
Commits
23905f14
Commit
23905f14
authored
7 years ago
by
Jerry Zhou
Committed by
z00417096 zhoujaiwei
7 years ago
Browse files
Options
Download
Patches
Plain Diff
feat(helm):use a variable for labels to get tiller pod
parent
e61ee5c5
main
Release
add-codeql
dependabot/go_modules/github.com/docker/distribution-2.8.2incompatible
dependabot/go_modules/github.com/lib/pq-1.10.9
dependabot/go_modules/github.com/rubenv/sql-migrate-1.4.0
dependabot/go_modules/golang.org/x/crypto-0.9.0
dependabot/go_modules/golang.org/x/term-0.8.0
dependabot/go_modules/k8s.io/klog/v2-2.100.1
dev-v2
feat-v3/event-emitter-lua
release-2.10
release-2.11
release-2.12
release-2.13
release-2.14
release-2.15
release-2.16
release-2.17
release-2.6
release-2.7
release-2.8
release-2.9
release-3.0
release-3.1
release-3.10
release-3.11
release-3.12
release-3.2
release-3.3
release-3.4
release-3.5
release-3.6
release-3.6.1
release-3.6.2
release-3.7
release-3.8
release-3.9
release-v3.0.0-beta.4
v3.12.0
v3.12.0-rc.1
v3.12.0-dev.1
v3.11.3
v3.11.2
v3.11.1
v3.11.0
v3.11.0-rc.2
v3.11.0-rc.1
v3.10.3
v3.10.2
v3.10.1
v3.10.0
v3.10.0-rc.1
v3.9.4
v3.9.3
v3.9.2
v3.9.1
v3.9.0
v3.9.0-rc.1
v3.8.2
v3.8.1
v3.8.0
v3.8.0-rc.2
v3.8.0-rc.1
v3.7.2
v3.7.1
v3.7.0
v3.7.0-rc.3
v3.7.0-rc.2
v3.7.0-rc.1
v3.6.3
v3.6.2
v3.6.1
v3.6.0
v3.6.0-rc.1
v3.5.4
v3.5.3
v3.5.2
v3.5.1
v3.5.0
v3.5.0-rc.2
v3.5.0-rc.1
v3.4.2
v3.4.1
v3.4.0
v3.4.0-rc.1
v3.3.4
v3.3.3
v3.3.2
v3.3.1
v3.3.0
v3.3.0-rc.2
v3.3.0-rc.1
v3.2.4
v3.2.3
v3.2.2
v3.2.1
v3.2.0
v3.2.0-rc.1
v3.1.3
v3.1.2
v3.1.1
v3.1.0
v3.1.0-rc.3
v3.1.0-rc.2
v3.1.0-rc.1
v3.0.3
v3.0.2
v3.0.1
v3.0.0
v3.0.0-rc.4
v3.0.0-rc.3
v3.0.0-rc.2
v3.0.0-rc.1
v3.0.0-beta.5
v3.0.0-beta.4
v3.0.0-beta.3
v3.0.0-beta.2
v3.0.0-beta.1
v3.0.0-alpha.2
v3.0.0-alpha.1
v2.17.0
v2.17.0-rc.1
v2.16.12
v2.16.11
v2.16.10
v2.16.9
v2.16.8
v2.16.7
v2.16.6
v2.16.5
v2.16.4
v2.16.3
v2.16.2
v2.16.1
v2.16.0
v2.16.0-rc.2
v2.16.0-rc.1
v2.15.2
v2.15.1
v2.15.0
v2.15.0-rc.2
v2.15.0-rc.1
v2.14.3
v2.14.2
v2.14.1
v2.14.0
v2.14.0-rc.2
v2.14.0-rc.1
v2.13.1
v2.13.1-rc.1
v2.13.0
v2.13.0-rc.2
v2.13.0-rc.1
v2.12.3
v2.12.2
v2.12.1
v2.12.0
v2.12.0-rc.2
v2.12.0-rc.1
v2.11.0
v2.11.0-rc.4
v2.11.0-rc.3
v2.11.0-rc.2
v2.11.0-rc.1
v2.10.0
v2.10.0-rc.3
v2.10.0-rc.2
v2.10.0-rc.1
v2.9.1
v2.9.0
v2.9.0-rc5
v2.9.0-rc4
v2.9.0-rc3
v2.9.0-rc2
v2.9.0-rc1
v2.8.2
v2.8.2-rc1
v2.8.1
v2.8.0
v2.8.0-rc.1
v2.7.2
v2.7.1
v2.7.0
v2.7.0-rc1
v2.6.2
v2.6.1
v2.6.0
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
pkg/helm/portforwarder/portforwarder.go
+5
-2
pkg/helm/portforwarder/portforwarder.go
pkg/helm/portforwarder/portforwarder_test.go
+1
-1
pkg/helm/portforwarder/portforwarder_test.go
with
6 additions
and
3 deletions
+6
-3
pkg/helm/portforwarder/portforwarder.go
+
5
−
2
View file @
23905f14
...
@@ -29,6 +29,10 @@ import (
...
@@ -29,6 +29,10 @@ import (
"k8s.io/helm/pkg/kube"
"k8s.io/helm/pkg/kube"
)
)
var
(
tillerPodLabels
labels
.
Set
=
labels
.
Set
{
"app"
:
"helm"
,
"name"
:
"tiller"
}
)
// New creates a new and initialized tunnel.
// New creates a new and initialized tunnel.
func
New
(
namespace
string
,
client
kubernetes
.
Interface
,
config
*
rest
.
Config
)
(
*
kube
.
Tunnel
,
error
)
{
func
New
(
namespace
string
,
client
kubernetes
.
Interface
,
config
*
rest
.
Config
)
(
*
kube
.
Tunnel
,
error
)
{
podName
,
err
:=
getTillerPodName
(
client
.
CoreV1
(),
namespace
)
podName
,
err
:=
getTillerPodName
(
client
.
CoreV1
(),
namespace
)
...
@@ -41,8 +45,7 @@ func New(namespace string, client kubernetes.Interface, config *rest.Config) (*k
...
@@ -41,8 +45,7 @@ func New(namespace string, client kubernetes.Interface, config *rest.Config) (*k
}
}
func
getTillerPodName
(
client
corev1
.
PodsGetter
,
namespace
string
)
(
string
,
error
)
{
func
getTillerPodName
(
client
corev1
.
PodsGetter
,
namespace
string
)
(
string
,
error
)
{
// TODO use a const for labels
selector
:=
tillerPodLabels
.
AsSelector
()
selector
:=
labels
.
Set
{
"app"
:
"helm"
,
"name"
:
"tiller"
}
.
AsSelector
()
pod
,
err
:=
getFirstRunningPod
(
client
,
namespace
,
selector
)
pod
,
err
:=
getFirstRunningPod
(
client
,
namespace
,
selector
)
if
err
!=
nil
{
if
err
!=
nil
{
return
""
,
err
return
""
,
err
...
...
This diff is collapsed.
Click to expand it.
pkg/helm/portforwarder/portforwarder_test.go
+
1
−
1
View file @
23905f14
...
@@ -29,7 +29,7 @@ func mockTillerPod() v1.Pod {
...
@@ -29,7 +29,7 @@ func mockTillerPod() v1.Pod {
ObjectMeta
:
metav1
.
ObjectMeta
{
ObjectMeta
:
metav1
.
ObjectMeta
{
Name
:
"orca"
,
Name
:
"orca"
,
Namespace
:
v1
.
NamespaceDefault
,
Namespace
:
v1
.
NamespaceDefault
,
Labels
:
map
[
string
]
string
{
"app"
:
"helm"
,
"name"
:
"tiller"
}
,
Labels
:
tillerPodLabels
,
},
},
Status
:
v1
.
PodStatus
{
Status
:
v1
.
PodStatus
{
Phase
:
v1
.
PodRunning
,
Phase
:
v1
.
PodRunning
,
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets