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
b62dfb98
Unverified
Commit
b62dfb98
authored
6 years ago
by
Adam Reese
Browse files
Options
Download
Patches
Plain Diff
remove tiller build infra
parent
e909258f
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
feat-v3/event-emitter-lua
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
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
Makefile
+2
-23
Makefile
rootfs/Dockerfile
+0
-26
rootfs/Dockerfile
rootfs/README.md
+0
-27
rootfs/README.md
versioning.mk
+0
-27
versioning.mk
with
2 additions
and
103 deletions
+2
-103
Makefile
+
2
−
23
View file @
b62dfb98
DOCKER_REGISTRY
?=
gcr.io
IMAGE_PREFIX
?=
kubernetes-helm
SHORT_NAME
?=
tiller
TARGETS
?=
darwin/amd64 linux/amd64 linux/386 linux/arm linux/arm64 linux/ppc64le windows/amd64
TARGETS
?=
darwin/amd64 linux/amd64 linux/386 linux/arm linux/arm64 linux/ppc64le windows/amd64
DIST_DIRS
=
find
*
-type
d
-exec
DIST_DIRS
=
find
*
-type
d
-exec
APP
=
helm
APP
=
helm
...
@@ -14,7 +11,7 @@ TESTFLAGS :=
...
@@ -14,7 +11,7 @@ TESTFLAGS :=
LDFLAGS
:=
-w
-s
LDFLAGS
:=
-w
-s
GOFLAGS
:=
GOFLAGS
:=
BINDIR
:=
$(
CURDIR
)
/bin
BINDIR
:=
$(
CURDIR
)
/bin
BINARIES
:=
helm
tiller
BINARIES
:=
helm
# Required for globs to work correctly
# Required for globs to work correctly
SHELL
=
/bin/bash
SHELL
=
/bin/bash
...
@@ -48,24 +45,6 @@ checksum:
...
@@ -48,24 +45,6 @@ checksum:
shasum
-a
256
"
$${
f
}
"
|
awk
'{print $$1}'
>
"
$${
f
}
.sha256"
;
\
shasum
-a
256
"
$${
f
}
"
|
awk
'{print $$1}'
>
"
$${
f
}
.sha256"
;
\
done
done
.PHONY
:
check-docker
check-docker
:
@
if
[
-z
$$(
which docker
)
]
;
then
\
echo
"Missing
\`
docker
\`
client which is required for development"
;
\
exit
2
;
\
fi
.PHONY
:
docker-binary
docker-binary
:
BINDIR = ./rootfs
docker-binary
:
GOFLAGS += -a -installsuffix cgo
docker-binary
:
GOOS
=
linux
GOARCH
=
amd64
CGO_ENABLED
=
0
$(
GO
)
build
-o
$(
BINDIR
)
/tiller
$(
GOFLAGS
)
-tags
'
$(
TAGS
)
'
-ldflags
'
$(
LDFLAGS
)
'
k8s.io/helm/cmd/tiller
.PHONY
:
docker-build
docker-build
:
check-docker docker-binary
docker build
--rm
-t
${
IMAGE
}
rootfs
docker tag
${
IMAGE
}
${
MUTABLE_IMAGE
}
.PHONY
:
test
.PHONY
:
test
test
:
build
test
:
build
test
:
TESTFLAGS += -race -v
test
:
TESTFLAGS += -race -v
...
@@ -97,7 +76,7 @@ verify-docs: build
...
@@ -97,7 +76,7 @@ verify-docs: build
.PHONY
:
clean
.PHONY
:
clean
clean
:
clean
:
@
rm
-rf
$(
BINDIR
)
./rootfs/tiller
./_dist
@
rm
-rf
$(
BINDIR
)
./_dist
.PHONY
:
coverage
.PHONY
:
coverage
coverage
:
coverage
:
...
...
This diff is collapsed.
Click to expand it.
rootfs/Dockerfile
deleted
100644 → 0
+
0
−
26
View file @
e909258f
# Copyright 2016 The Kubernetes Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
FROM
alpine:3.3
RUN
apk update
&&
apk add ca-certificates
&&
rm
-rf
/var/cache/apk/
*
ENV
HOME /tmp
COPY
tiller /tiller
EXPOSE
44134
CMD
["/tiller"]
This diff is collapsed.
Click to expand it.
rootfs/README.md
deleted
100644 → 0
+
0
−
27
View file @
e909258f
# RootFS
This directory stores all files that should be copied to the rootfs of a
Docker container. The files should be stored according to the correct
directory structure of the destination container. For example:
```
rootfs/bin -> /bin
rootfs/usr/local/share -> /usr/local/share
```
## Dockerfile
A Dockerfile in the rootfs is used to build the image. Where possible,
compilation should not be done in this Dockerfile, since we are
interested in deploying the smallest possible images.
Example:
```
Dockerfile
FROM
alpine:3.2
COPY
. /
ENTRYPOINT
["/usr/local/bin/boot"]
```
This diff is collapsed.
Click to expand it.
versioning.mk
+
0
−
27
View file @
b62dfb98
MUTABLE_VERSION
:=
canary
GIT_COMMIT
=
$(
shell git rev-parse HEAD
)
GIT_COMMIT
=
$(
shell git rev-parse HEAD
)
GIT_SHA
=
$(
shell git rev-parse
--short
HEAD
)
GIT_SHA
=
$(
shell git rev-parse
--short
HEAD
)
GIT_TAG
=
$(
shell git describe
--tags
--abbrev
=
0
--exact-match
2>/dev/null
)
GIT_TAG
=
$(
shell git describe
--tags
--abbrev
=
0
--exact-match
2>/dev/null
)
GIT_DIRTY
=
$(
shell
test
-n
"
`
git status
--porcelain
`
"
&&
echo
"dirty"
||
echo
"clean"
)
GIT_DIRTY
=
$(
shell
test
-n
"
`
git status
--porcelain
`
"
&&
echo
"dirty"
||
echo
"clean"
)
ifdef
VERSION
ifdef
VERSION
DOCKER_VERSION
=
$(
VERSION
)
BINARY_VERSION
=
$(
VERSION
)
BINARY_VERSION
=
$(
VERSION
)
endif
endif
DOCKER_VERSION
?=
git-
${
GIT_SHA
}
BINARY_VERSION
?=
${
GIT_TAG
}
BINARY_VERSION
?=
${
GIT_TAG
}
# Only set Version if building a tag or VERSION is set
# Only set Version if building a tag or VERSION is set
...
@@ -25,31 +21,8 @@ endif
...
@@ -25,31 +21,8 @@ endif
LDFLAGS
+=
-X
k8s.io/helm/pkg/version.GitCommit
=
${
GIT_COMMIT
}
LDFLAGS
+=
-X
k8s.io/helm/pkg/version.GitCommit
=
${
GIT_COMMIT
}
LDFLAGS
+=
-X
k8s.io/helm/pkg/version.GitTreeState
=
${
GIT_DIRTY
}
LDFLAGS
+=
-X
k8s.io/helm/pkg/version.GitTreeState
=
${
GIT_DIRTY
}
IMAGE
:=
${
DOCKER_REGISTRY
}
/
${
IMAGE_PREFIX
}
/
${
SHORT_NAME
}
:
${
DOCKER_VERSION
}
MUTABLE_IMAGE
:=
${
DOCKER_REGISTRY
}
/
${
IMAGE_PREFIX
}
/
${
SHORT_NAME
}
:
${
MUTABLE_VERSION
}
DOCKER_PUSH
=
docker push
ifeq
($(DOCKER_REGISTRY),gcr.io)
DOCKER_PUSH
=
gcloud docker push
endif
info
:
info
:
@
echo
"Version:
${
VERSION
}
"
@
echo
"Version:
${
VERSION
}
"
@
echo
"Git Tag:
${
GIT_TAG
}
"
@
echo
"Git Tag:
${
GIT_TAG
}
"
@
echo
"Git Commit:
${
GIT_COMMIT
}
"
@
echo
"Git Commit:
${
GIT_COMMIT
}
"
@
echo
"Git Tree State:
${
GIT_DIRTY
}
"
@
echo
"Git Tree State:
${
GIT_DIRTY
}
"
@
echo
"Docker Version:
${
DOCKER_VERSION
}
"
@
echo
"Registry:
${
DOCKER_REGISTRY
}
"
@
echo
"Immutable Image:
${
IMAGE
}
"
@
echo
"Mutable Image:
${
MUTABLE_IMAGE
}
"
.PHONY
:
docker-push
docker-push
:
docker-mutable-push docker-immutable-push
.PHONY
:
docker-immutable-push
docker-immutable-push
:
${
DOCKER_PUSH
}
${
IMAGE
}
.PHONY
:
docker-mutable-push
docker-mutable-push
:
${
DOCKER_PUSH
}
${
MUTABLE_IMAGE
}
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