mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Merge pull request #19961 from mamikonyana/newrepo
Auto commit by PR queue bot
This commit is contained in:
commit
2286bd3a38
@ -92,7 +92,7 @@ KUBE_APISERVER_OPTS=" \${KUBE_LOGTOSTDERR} \\
|
|||||||
cat <<EOF >/usr/lib/systemd/system/kube-apiserver.service
|
cat <<EOF >/usr/lib/systemd/system/kube-apiserver.service
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Kubernetes API Server
|
Description=Kubernetes API Server
|
||||||
Documentation=https://github.com/GoogleCloudPlatform/kubernetes
|
Documentation=https://github.com/kubernetes/kubernetes
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
EnvironmentFile=-/opt/kubernetes/cfg/kube-apiserver
|
EnvironmentFile=-/opt/kubernetes/cfg/kube-apiserver
|
||||||
|
@ -40,7 +40,7 @@ KUBE_CONTROLLER_MANAGER_OPTS=" \${KUBE_LOGTOSTDERR} \\
|
|||||||
cat <<EOF >/usr/lib/systemd/system/kube-controller-manager.service
|
cat <<EOF >/usr/lib/systemd/system/kube-controller-manager.service
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Kubernetes Controller Manager
|
Description=Kubernetes Controller Manager
|
||||||
Documentation=https://github.com/GoogleCloudPlatform/kubernetes
|
Documentation=https://github.com/kubernetes/kubernetes
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
EnvironmentFile=-/opt/kubernetes/cfg/kube-controller-manager
|
EnvironmentFile=-/opt/kubernetes/cfg/kube-controller-manager
|
||||||
|
@ -42,7 +42,7 @@ KUBE_SCHEDULER_OPTS=" \${KUBE_LOGTOSTDERR} \\
|
|||||||
cat <<EOF >/usr/lib/systemd/system/kube-scheduler.service
|
cat <<EOF >/usr/lib/systemd/system/kube-scheduler.service
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Kubernetes Scheduler
|
Description=Kubernetes Scheduler
|
||||||
Documentation=https://github.com/GoogleCloudPlatform/kubernetes
|
Documentation=https://github.com/kubernetes/kubernetes
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
EnvironmentFile=-/opt/kubernetes/cfg/kube-scheduler
|
EnvironmentFile=-/opt/kubernetes/cfg/kube-scheduler
|
||||||
|
@ -9,7 +9,7 @@ coreos:
|
|||||||
After=opt-kubernetes.mount etcd2.service
|
After=opt-kubernetes.mount etcd2.service
|
||||||
ConditionFileIsExecutable=/opt/kubernetes/bin/kube-apiserver
|
ConditionFileIsExecutable=/opt/kubernetes/bin/kube-apiserver
|
||||||
Description=Kubernetes API Server
|
Description=Kubernetes API Server
|
||||||
Documentation=https://github.com/GoogleCloudPlatform/kubernetes
|
Documentation=https://github.com/kubernetes/kubernetes
|
||||||
Requires=opt-kubernetes.mount etcd2.service
|
Requires=opt-kubernetes.mount etcd2.service
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
@ -34,7 +34,7 @@ coreos:
|
|||||||
After=opt-kubernetes.mount kube-apiserver.service
|
After=opt-kubernetes.mount kube-apiserver.service
|
||||||
ConditionFileIsExecutable=/opt/kubernetes/bin/kube-controller-manager
|
ConditionFileIsExecutable=/opt/kubernetes/bin/kube-controller-manager
|
||||||
Description=Kubernetes Controller Manager
|
Description=Kubernetes Controller Manager
|
||||||
Documentation=https://github.com/GoogleCloudPlatform/kubernetes
|
Documentation=https://github.com/kubernetes/kubernetes
|
||||||
Requires=opt-kubernetes.mount kube-apiserver.service
|
Requires=opt-kubernetes.mount kube-apiserver.service
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
@ -53,7 +53,7 @@ coreos:
|
|||||||
After=opt-kubernetes.mount kube-apiserver.service
|
After=opt-kubernetes.mount kube-apiserver.service
|
||||||
ConditionFileIsExecutable=/opt/kubernetes/bin/kube-scheduler
|
ConditionFileIsExecutable=/opt/kubernetes/bin/kube-scheduler
|
||||||
Description=Kubernetes Scheduler
|
Description=Kubernetes Scheduler
|
||||||
Documentation=https://github.com/GoogleCloudPlatform/kubernetes
|
Documentation=https://github.com/kubernetes/kubernetes
|
||||||
Requires=opt-kubernetes.mount kube-apiserver.service
|
Requires=opt-kubernetes.mount kube-apiserver.service
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
@ -71,7 +71,7 @@ coreos:
|
|||||||
After=opt-kubernetes.mount kube-apiserver.service
|
After=opt-kubernetes.mount kube-apiserver.service
|
||||||
ConditionPathIsDirectory=/opt/kubernetes/addons
|
ConditionPathIsDirectory=/opt/kubernetes/addons
|
||||||
Description=Kubernetes addons
|
Description=Kubernetes addons
|
||||||
Documentation=https://github.com/GoogleCloudPlatform/kubernetes
|
Documentation=https://github.com/kubernetes/kubernetes
|
||||||
Requires=opt-kubernetes.mount
|
Requires=opt-kubernetes.mount
|
||||||
Wants=kube-apiserver.service
|
Wants=kube-apiserver.service
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@ coreos:
|
|||||||
After=opt-kubernetes.mount docker.socket
|
After=opt-kubernetes.mount docker.socket
|
||||||
ConditionFileIsExecutable=/opt/kubernetes/bin/kubelet
|
ConditionFileIsExecutable=/opt/kubernetes/bin/kubelet
|
||||||
Description=Kubernetes Kubelet
|
Description=Kubernetes Kubelet
|
||||||
Documentation=https://github.com/GoogleCloudPlatform/kubernetes
|
Documentation=https://github.com/kubernetes/kubernetes
|
||||||
Requires=opt-kubernetes.mount docker.socket
|
Requires=opt-kubernetes.mount docker.socket
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
@ -32,7 +32,7 @@ coreos:
|
|||||||
After=opt-kubernetes.mount
|
After=opt-kubernetes.mount
|
||||||
ConditionFileIsExecutable=/opt/kubernetes/bin/kube-proxy
|
ConditionFileIsExecutable=/opt/kubernetes/bin/kube-proxy
|
||||||
Description=Kubernetes Proxy
|
Description=Kubernetes Proxy
|
||||||
Documentation=https://github.com/GoogleCloudPlatform/kubernetes
|
Documentation=https://github.com/kubernetes/kubernetes
|
||||||
Requires=opt-kubernetes.mount
|
Requires=opt-kubernetes.mount
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
|
@ -77,7 +77,7 @@ coreos:
|
|||||||
content: |
|
content: |
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Kubernetes API Server
|
Description=Kubernetes API Server
|
||||||
Documentation=https://github.com/GoogleCloudPlatform/kubernetes
|
Documentation=https://github.com/kubernetes/kubernetes
|
||||||
After=network-online.target
|
After=network-online.target
|
||||||
Requires=network-online.target
|
Requires=network-online.target
|
||||||
After=download-release.service
|
After=download-release.service
|
||||||
@ -114,7 +114,7 @@ coreos:
|
|||||||
content: |
|
content: |
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Kubernetes Controller Manager
|
Description=Kubernetes Controller Manager
|
||||||
Documentation=https://github.com/GoogleCloudPlatform/kubernetes
|
Documentation=https://github.com/kubernetes/kubernetes
|
||||||
After=network-online.target
|
After=network-online.target
|
||||||
Requires=network-online.target
|
Requires=network-online.target
|
||||||
After=kube-apiserver.service
|
After=kube-apiserver.service
|
||||||
@ -134,7 +134,7 @@ coreos:
|
|||||||
content: |
|
content: |
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Kubernetes Scheduler
|
Description=Kubernetes Scheduler
|
||||||
Documentation=https://github.com/GoogleCloudPlatform/kubernetes
|
Documentation=https://github.com/kubernetes/kubernetes
|
||||||
After=network-online.target
|
After=network-online.target
|
||||||
Requires=network-online.target
|
Requires=network-online.target
|
||||||
After=kube-apiserver.service
|
After=kube-apiserver.service
|
||||||
|
@ -137,7 +137,7 @@ coreos:
|
|||||||
content: |
|
content: |
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Kubernetes Kubelet
|
Description=Kubernetes Kubelet
|
||||||
Documentation=https://github.com/GoogleCloudPlatform/kubernetes
|
Documentation=https://github.com/kubernetes/kubernetes
|
||||||
After=network-online.target
|
After=network-online.target
|
||||||
Requires=network-online.target
|
Requires=network-online.target
|
||||||
After=docker.service
|
After=docker.service
|
||||||
@ -164,7 +164,7 @@ coreos:
|
|||||||
content: |
|
content: |
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Kubernetes Proxy
|
Description=Kubernetes Proxy
|
||||||
Documentation=https://github.com/GoogleCloudPlatform/kubernetes
|
Documentation=https://github.com/kubernetes/kubernetes
|
||||||
After=network-online.target
|
After=network-online.target
|
||||||
Requires=network-online.target
|
Requires=network-online.target
|
||||||
After=docker.service
|
After=docker.service
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[Unit]
|
[Unit]
|
||||||
Description=Kubernetes Addon Object Manager
|
Description=Kubernetes Addon Object Manager
|
||||||
Documentation=https://github.com/GoogleCloudPlatform/kubernetes
|
Documentation=https://github.com/kubernetes/kubernetes
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
ExecStart=/etc/kubernetes/kube-addons.sh
|
ExecStart=/etc/kubernetes/kube-addons.sh
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[Unit]
|
[Unit]
|
||||||
Description=Kubernetes-Master Addon Object Manager
|
Description=Kubernetes-Master Addon Object Manager
|
||||||
Documentation=https://github.com/GoogleCloudPlatform/kubernetes
|
Documentation=https://github.com/kubernetes/kubernetes
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
ExecStart=/etc/kubernetes/kube-master-addons.sh
|
ExecStart=/etc/kubernetes/kube-master-addons.sh
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[Unit]
|
[Unit]
|
||||||
Description=Kubernetes Node Unpacker
|
Description=Kubernetes Node Unpacker
|
||||||
Documentation=https://github.com/GoogleCloudPlatform/kubernetes
|
Documentation=https://github.com/kubernetes/kubernetes
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
ExecStart=/etc/kubernetes/kube-node-unpacker.sh
|
ExecStart=/etc/kubernetes/kube-node-unpacker.sh
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[Unit]
|
[Unit]
|
||||||
Description=Kubernetes Kubelet Server
|
Description=Kubernetes Kubelet Server
|
||||||
Documentation=https://github.com/GoogleCloudPlatform/kubernetes
|
Documentation=https://github.com/kubernetes/kubernetes
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
EnvironmentFile=/etc/sysconfig/kubelet
|
EnvironmentFile=/etc/sysconfig/kubelet
|
||||||
|
@ -652,7 +652,7 @@ func validateLeadershipTransition(desired, current string) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// hacked from https://github.com/GoogleCloudPlatform/kubernetes/blob/release-0.14/cmd/kube-apiserver/app/server.go
|
// hacked from https://github.com/kubernetes/kubernetes/blob/release-0.14/cmd/kube-apiserver/app/server.go
|
||||||
func newEtcd(etcdServerList []string) (etcd.Client, error) {
|
func newEtcd(etcdServerList []string) (etcd.Client, error) {
|
||||||
cfg := etcd.Config{
|
cfg := etcd.Config{
|
||||||
Endpoints: etcdServerList,
|
Endpoints: etcdServerList,
|
||||||
|
@ -184,7 +184,7 @@ coreos:
|
|||||||
Documentation=http://kubernetes.io/
|
Documentation=http://kubernetes.io/
|
||||||
Requires=network-online.target
|
Requires=network-online.target
|
||||||
[Service]
|
[Service]
|
||||||
Environment=KUBE_RELEASE_TARBALL=https://github.com/GoogleCloudPlatform/kubernetes/releases/download/v1.1.2/kubernetes.tar.gz
|
Environment=KUBE_RELEASE_TARBALL=https://github.com/kubernetes/kubernetes/releases/download/v1.1.2/kubernetes.tar.gz
|
||||||
ExecStartPre=/bin/mkdir -p /opt/
|
ExecStartPre=/bin/mkdir -p /opt/
|
||||||
ExecStart=/opt/bin/curl-retry.sh --silent --location $KUBE_RELEASE_TARBALL --output /tmp/kubernetes.tgz
|
ExecStart=/opt/bin/curl-retry.sh --silent --location $KUBE_RELEASE_TARBALL --output /tmp/kubernetes.tgz
|
||||||
ExecStart=/bin/tar xzvf /tmp/kubernetes.tgz -C /tmp/
|
ExecStart=/bin/tar xzvf /tmp/kubernetes.tgz -C /tmp/
|
||||||
|
@ -76,7 +76,7 @@ coreos:
|
|||||||
content: |
|
content: |
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Kubernetes API Server
|
Description=Kubernetes API Server
|
||||||
Documentation=https://github.com/GoogleCloudPlatform/kubernetes
|
Documentation=https://github.com/kubernetes/kubernetes
|
||||||
Requires=setup-network-environment.service etcd2.service generate-serviceaccount-key.service
|
Requires=setup-network-environment.service etcd2.service generate-serviceaccount-key.service
|
||||||
After=setup-network-environment.service etcd2.service generate-serviceaccount-key.service
|
After=setup-network-environment.service etcd2.service generate-serviceaccount-key.service
|
||||||
|
|
||||||
@ -107,7 +107,7 @@ coreos:
|
|||||||
content: |
|
content: |
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Kubernetes Controller Manager
|
Description=Kubernetes Controller Manager
|
||||||
Documentation=https://github.com/GoogleCloudPlatform/kubernetes
|
Documentation=https://github.com/kubernetes/kubernetes
|
||||||
Requires=kube-apiserver.service
|
Requires=kube-apiserver.service
|
||||||
After=kube-apiserver.service
|
After=kube-apiserver.service
|
||||||
|
|
||||||
@ -125,7 +125,7 @@ coreos:
|
|||||||
content: |
|
content: |
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Kubernetes Scheduler
|
Description=Kubernetes Scheduler
|
||||||
Documentation=https://github.com/GoogleCloudPlatform/kubernetes
|
Documentation=https://github.com/kubernetes/kubernetes
|
||||||
Requires=kube-apiserver.service
|
Requires=kube-apiserver.service
|
||||||
After=kube-apiserver.service
|
After=kube-apiserver.service
|
||||||
|
|
||||||
|
@ -45,7 +45,7 @@ coreos:
|
|||||||
content: |
|
content: |
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Kubernetes Proxy
|
Description=Kubernetes Proxy
|
||||||
Documentation=https://github.com/GoogleCloudPlatform/kubernetes
|
Documentation=https://github.com/kubernetes/kubernetes
|
||||||
Requires=setup-network-environment.service
|
Requires=setup-network-environment.service
|
||||||
After=setup-network-environment.service
|
After=setup-network-environment.service
|
||||||
|
|
||||||
@ -64,7 +64,7 @@ coreos:
|
|||||||
content: |
|
content: |
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Kubernetes Kubelet
|
Description=Kubernetes Kubelet
|
||||||
Documentation=https://github.com/GoogleCloudPlatform/kubernetes
|
Documentation=https://github.com/kubernetes/kubernetes
|
||||||
Requires=setup-network-environment.service
|
Requires=setup-network-environment.service
|
||||||
After=setup-network-environment.service
|
After=setup-network-environment.service
|
||||||
|
|
||||||
|
@ -82,7 +82,7 @@ and allocates a unique MCS label per pod.
|
|||||||
### Kubernetes
|
### Kubernetes
|
||||||
|
|
||||||
|
|
||||||
There is a [proposed change](https://github.com/GoogleCloudPlatform/kubernetes/pull/9844) to the
|
There is a [proposed change](https://github.com/kubernetes/kubernetes/pull/9844) to the
|
||||||
EmptyDir plugin that adds SELinux relabeling capabilities to that plugin, which is also carried as a
|
EmptyDir plugin that adds SELinux relabeling capabilities to that plugin, which is also carried as a
|
||||||
patch in [OpenShift](https://github.com/openshift/origin). It is preferable to solve the problem
|
patch in [OpenShift](https://github.com/openshift/origin). It is preferable to solve the problem
|
||||||
in general of handling SELinux in kubernetes to merging this PR.
|
in general of handling SELinux in kubernetes to merging this PR.
|
||||||
@ -216,7 +216,7 @@ depends on:
|
|||||||
|
|
||||||
1. Users and groups in Kubernetes
|
1. Users and groups in Kubernetes
|
||||||
2. General auth policy in Kubernetes
|
2. General auth policy in Kubernetes
|
||||||
3. [security policy](https://github.com/GoogleCloudPlatform/kubernetes/pull/7893)
|
3. [security policy](https://github.com/kubernetes/kubernetes/pull/7893)
|
||||||
|
|
||||||
### API changes
|
### API changes
|
||||||
|
|
||||||
|
@ -152,9 +152,9 @@ created in the volume will inherit the owning GID of the volume.
|
|||||||
|
|
||||||
## Community Design Discussion
|
## Community Design Discussion
|
||||||
|
|
||||||
- [kubernetes/2630](https://github.com/GoogleCloudPlatform/kubernetes/issues/2630)
|
- [kubernetes/2630](https://github.com/kubernetes/kubernetes/issues/2630)
|
||||||
- [kubernetes/11319](https://github.com/GoogleCloudPlatform/kubernetes/issues/11319)
|
- [kubernetes/11319](https://github.com/kubernetes/kubernetes/issues/11319)
|
||||||
- [kubernetes/9384](https://github.com/GoogleCloudPlatform/kubernetes/pull/9384)
|
- [kubernetes/9384](https://github.com/kubernetes/kubernetes/pull/9384)
|
||||||
|
|
||||||
## Analysis
|
## Analysis
|
||||||
|
|
||||||
|
@ -3,8 +3,8 @@
|
|||||||
# Elasticsearch and Kibana pods for the GCE platform.
|
# Elasticsearch and Kibana pods for the GCE platform.
|
||||||
# For examples of how to observe the ingested logs please
|
# For examples of how to observe the ingested logs please
|
||||||
# see the appropriate getting started guide e.g.
|
# see the appropriate getting started guide e.g.
|
||||||
# Google Cloud Logging: https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/getting-started-guides/logging.md
|
# Google Cloud Logging: https://github.com/kubernetes/kubernetes/blob/master/docs/getting-started-guides/logging.md
|
||||||
# With Elasticsearch and Kibana logging: https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/getting-started-guides/logging-elasticsearch.md
|
# With Elasticsearch and Kibana logging: https://github.com/kubernetes/kubernetes/blob/master/docs/getting-started-guides/logging-elasticsearch.md
|
||||||
|
|
||||||
.PHONY: up down logger-up logger-down logger10-up logger10-down
|
.PHONY: up down logger-up logger-down logger10-up logger10-down
|
||||||
|
|
||||||
|
@ -104,7 +104,7 @@ https://github.com/swagger-api/swagger-ui#how-to-use-it
|
|||||||
## Local Modifications
|
## Local Modifications
|
||||||
- Updated the url in index.html to "../../swaggerapi" as per instructions at:
|
- Updated the url in index.html to "../../swaggerapi" as per instructions at:
|
||||||
https://github.com/swagger-api/swagger-ui#how-to-use-it
|
https://github.com/swagger-api/swagger-ui#how-to-use-it
|
||||||
- Modified swagger-ui.js to list resources and operations in sorted order: https://github.com/GoogleCloudPlatform/kubernetes/pull/3421
|
- Modified swagger-ui.js to list resources and operations in sorted order: https://github.com/kubernetes/kubernetes/pull/3421
|
||||||
- Set supportedSubmitMethods: [] in index.html to remove "Try it out" buttons.
|
- Set supportedSubmitMethods: [] in index.html to remove "Try it out" buttons.
|
||||||
|
|
||||||
LICENSE file has been created for compliance purposes.
|
LICENSE file has been created for compliance purposes.
|
||||||
|
@ -43,7 +43,7 @@ var (
|
|||||||
gitMinor string = "" // minor version, numeric possibly followed by "+"
|
gitMinor string = "" // minor version, numeric possibly followed by "+"
|
||||||
|
|
||||||
// semantic version, dervied by build scripts (see
|
// semantic version, dervied by build scripts (see
|
||||||
// https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/design/versioning.md
|
// https://github.com/kubernetes/kubernetes/blob/master/docs/design/versioning.md
|
||||||
// for a detailed discussion of this field)
|
// for a detailed discussion of this field)
|
||||||
//
|
//
|
||||||
// TODO: This field is still called "gitVersion" for legacy
|
// TODO: This field is still called "gitVersion" for legacy
|
||||||
|
@ -65,7 +65,7 @@ type expectedCommand struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestPlugin(t *testing.T) {
|
func TestPlugin(t *testing.T) {
|
||||||
gitUrl := "https://github.com/GoogleCloudPlatform/kubernetes.git"
|
gitUrl := "https://github.com/kubernetes/kubernetes.git"
|
||||||
revision := "2a30ce65c5ab586b98916d83385c5983edd353a1"
|
revision := "2a30ce65c5ab586b98916d83385c5983edd353a1"
|
||||||
|
|
||||||
scenarios := []struct {
|
scenarios := []struct {
|
||||||
|
@ -16,5 +16,5 @@ limitations under the License.
|
|||||||
|
|
||||||
//Package keystone provide authentication via keystone.
|
//Package keystone provide authentication via keystone.
|
||||||
// For details //about keystone and how to use the plugin, refer to
|
// For details //about keystone and how to use the plugin, refer to
|
||||||
// https://github.com/GoogleCloudPlatform/kubernetes/blob/oidc/docs/admin/authentication.md
|
// https://github.com/kubernetes/kubernetes/blob/oidc/docs/admin/authentication.md
|
||||||
package keystone
|
package keystone
|
||||||
|
Loading…
Reference in New Issue
Block a user