MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-09 13:39:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

remove references for deprecated dockerfiles and deployment styles (#9675)

Browse Source
This commit is contained in:
Harshavardhana
2020-05-22 08:40:59 -07:00
committed by GitHub
parent 7d79c723e5
commit e45c90060f
16 changed files with 17 additions and 745 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/update.go
View File

@@ -130,7 +130,7 @@ func GetCurrentReleaseTime() (releaseTime time.Time, err error) {
// "/.dockerenv": "file",
//
func IsDocker() bool {
if env.Get("SIMPLE_CI", "") == "" {
if env.Get("MINIO_CI_CD", "") == "" {
_, err := os.Stat("/.dockerenv")
if os.IsNotExist(err) {
return false
@@ -146,7 +146,7 @@ func IsDocker() bool {
// IsDCOS returns true if minio is running in DCOS.
func IsDCOS() bool {
if env.Get("SIMPLE_CI", "") == "" {
if env.Get("MINIO_CI_CD", "") == "" {
// http://mesos.apache.org/documentation/latest/docker-containerizer/
// Mesos docker containerizer sets this value
return env.Get("MESOS_CONTAINER_NAME", "") != ""
@@ -161,7 +161,7 @@ func IsKubernetesReplicaSet() bool {
// IsKubernetes returns true if minio is running in kubernetes.
func IsKubernetes() bool {
if env.Get("SIMPLE_CI", "") == "" {
if env.Get("MINIO_CI_CD", "") == "" {
// Kubernetes env used to validate if we are
// indeed running inside a kubernetes pod
// is KUBERNETES_SERVICE_HOST but in future

24
cmd/update_test.go
View File

@@ -81,10 +81,10 @@ func TestReleaseTagToNFromTimeConversion(t *testing.T) {
}
func TestDownloadURL(t *testing.T) {
sci := os.Getenv("SIMPLE_CI")
sci := os.Getenv("MINIO_CI_CD")
os.Setenv("SIMPLE_CI", "")
defer os.Setenv("SIMPLE_CI", sci)
os.Setenv("MINIO_CI_CD", "")
defer os.Setenv("MINIO_CI_CD", sci)
minioVersion1 := releaseTimeToReleaseTag(UTCNow())
durl := getDownloadURL(minioVersion1)
@@ -148,8 +148,8 @@ func TestUserAgent(t *testing.T) {
}
for i, testCase := range testCases {
sci := os.Getenv("SIMPLE_CI")
os.Setenv("SIMPLE_CI", "")
sci := os.Getenv("MINIO_CI_CD")
os.Setenv("MINIO_CI_CD", "")
os.Setenv(testCase.envName, testCase.envValue)
if testCase.envName == "MESOS_CONTAINER_NAME" {
@@ -163,7 +163,7 @@ func TestUserAgent(t *testing.T) {
if str != expectedStr {
t.Errorf("Test %d: expected: %s, got: %s", i+1, expectedStr, str)
}
os.Setenv("SIMPLE_CI", sci)
os.Setenv("MINIO_CI_CD", sci)
os.Unsetenv("MARATHON_APP_LABEL_DCOS_PACKAGE_VERSION")
os.Unsetenv(testCase.envName)
}
@@ -171,9 +171,9 @@ func TestUserAgent(t *testing.T) {
// Tests if the environment we are running is in DCOS.
func TestIsDCOS(t *testing.T) {
sci := os.Getenv("SIMPLE_CI")
os.Setenv("SIMPLE_CI", "")
defer os.Setenv("SIMPLE_CI", sci)
sci := os.Getenv("MINIO_CI_CD")
os.Setenv("MINIO_CI_CD", "")
defer os.Setenv("MINIO_CI_CD", sci)
os.Setenv("MESOS_CONTAINER_NAME", "mesos-1111")
dcos := IsDCOS()
@@ -190,9 +190,9 @@ func TestIsDCOS(t *testing.T) {
// Tests if the environment we are running is in kubernetes.
func TestIsKubernetes(t *testing.T) {
sci := os.Getenv("SIMPLE_CI")
os.Setenv("SIMPLE_CI", "")
defer os.Setenv("SIMPLE_CI", sci)
sci := os.Getenv("MINIO_CI_CD")
os.Setenv("MINIO_CI_CD", "")
defer os.Setenv("MINIO_CI_CD", sci)
os.Setenv("KUBERNETES_SERVICE_HOST", "10.11.148.5")
kubernetes := IsKubernetes()