Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
02de75fb
Commit
02de75fb
authored
Jan 19, 2018
by
Mike Danese
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cluster: remove some cvm stuff
parent
49610655
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
17 deletions
+2
-17
common.sh
cluster/common.sh
+0
-1
config-default.sh
cluster/gce/config-default.sh
+0
-4
config-test.sh
cluster/gce/config-test.sh
+0
-4
util.sh
cluster/gce/util.sh
+2
-8
No files found.
cluster/common.sh
View file @
02de75fb
...
...
@@ -583,7 +583,6 @@ NETWORK_PROVIDER: $(yaml-quote ${NETWORK_PROVIDER:-})
NETWORK_POLICY_PROVIDER:
$(
yaml-quote
${
NETWORK_POLICY_PROVIDER
:-})
PREPULL_E2E_IMAGES:
$(
yaml-quote
${
PREPULL_E2E_IMAGES
:-})
HAIRPIN_MODE:
$(
yaml-quote
${
HAIRPIN_MODE
:-})
SOFTLOCKUP_PANIC:
$(
yaml-quote
${
SOFTLOCKUP_PANIC
:-})
E2E_STORAGE_TEST_ENVIRONMENT:
$(
yaml-quote
${
E2E_STORAGE_TEST_ENVIRONMENT
:-})
KUBE_IMAGE_TAG:
$(
yaml-quote
${
KUBE_IMAGE_TAG
:-})
KUBE_DOCKER_REGISTRY:
$(
yaml-quote
${
KUBE_DOCKER_REGISTRY
:-})
...
...
cluster/gce/config-default.sh
View file @
02de75fb
...
...
@@ -338,10 +338,6 @@ ENABLE_DEFAULT_STORAGE_CLASS="${ENABLE_DEFAULT_STORAGE_CLASS:-true}"
# Optional: Enable legacy ABAC policy that makes all service accounts superusers.
ENABLE_LEGACY_ABAC
=
"
${
ENABLE_LEGACY_ABAC
:-
false
}
"
# true, false
# TODO(dawn1107): Remove this once the flag is built into CVM image.
# Kernel panic upon soft lockup issue
SOFTLOCKUP_PANIC
=
"
${
SOFTLOCKUP_PANIC
:-
false
}
"
# true, false
# Indicates if the values (i.e. KUBE_USER and KUBE_PASSWORD for basic
# authentication) in metadata should be treated as canonical, and therefore disk
# copies ought to be recreated/clobbered.
...
...
cluster/gce/config-test.sh
View file @
02de75fb
...
...
@@ -377,10 +377,6 @@ ENABLE_DEFAULT_STORAGE_CLASS="${ENABLE_DEFAULT_STORAGE_CLASS:-true}"
# Upgrade test jobs that go from a version < 1.6 to a version >= 1.6 should override this to be true.
ENABLE_LEGACY_ABAC
=
"
${
ENABLE_LEGACY_ABAC
:-
false
}
"
# true, false
# TODO(dawn1107): Remove this once the flag is built into CVM image.
# Kernel panic upon soft lockup issue
SOFTLOCKUP_PANIC
=
"
${
SOFTLOCKUP_PANIC
:-
true
}
"
# true, false
# Enable a simple "AdvancedAuditing" setup for testing.
ENABLE_APISERVER_ADVANCED_AUDIT
=
"
${
ENABLE_APISERVER_ADVANCED_AUDIT
:-
true
}
"
# true, false
...
...
cluster/gce/util.sh
View file @
02de75fb
...
...
@@ -53,9 +53,6 @@ if [[ "${MASTER_OS_DISTRIBUTION}" == "gci" ]]; then
# If the master image is not set, we use the latest GCI image.
# Otherwise, we respect whatever is set by the user.
MASTER_IMAGE
=
${
KUBE_GCE_MASTER_IMAGE
:-${
GCI_VERSION
}}
elif
[[
"
${
MASTER_OS_DISTRIBUTION
}
"
==
"debian"
]]
;
then
MASTER_IMAGE
=
${
KUBE_GCE_MASTER_IMAGE
:-${
CVM_VERSION
}}
MASTER_IMAGE_PROJECT
=
${
KUBE_GCE_MASTER_PROJECT
:-
google
-containers
}
fi
# Sets node image based on the specified os distro. Currently this function only
...
...
@@ -71,9 +68,6 @@ function set-node-image() {
# Otherwise, we respect whatever is set by the user.
NODE_IMAGE
=
${
KUBE_GCE_NODE_IMAGE
:-${
GCI_VERSION
}}
NODE_IMAGE_PROJECT
=
${
KUBE_GCE_NODE_PROJECT
:-${
DEFAULT_GCI_PROJECT
}}
elif
[[
"
${
NODE_OS_DISTRIBUTION
}
"
==
"debian"
]]
;
then
NODE_IMAGE
=
${
KUBE_GCE_NODE_IMAGE
:-${
CVM_VERSION
}}
NODE_IMAGE_PROJECT
=
${
KUBE_GCE_NODE_PROJECT
:-
google
-containers
}
fi
}
...
...
@@ -703,8 +697,8 @@ function kube-up() {
detect-subnetworks
create-nodes
elif
[[
${
KUBE_REPLICATE_EXISTING_MASTER
:-}
==
"true"
]]
;
then
if
[[
"
${
MASTER_OS_DISTRIBUTION
}
"
!=
"gci"
&&
"
${
MASTER_OS_DISTRIBUTION
}
"
!=
"
debian"
&&
"
${
MASTER_OS_DISTRIBUTION
}
"
!=
"
ubuntu"
]]
;
then
echo
"Master replication supported only for gci
, debian,
and ubuntu"
if
[[
"
${
MASTER_OS_DISTRIBUTION
}
"
!=
"gci"
&&
"
${
MASTER_OS_DISTRIBUTION
}
"
!=
"ubuntu"
]]
;
then
echo
"Master replication supported only for gci and ubuntu"
return
1
fi
create-loadbalancer
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment