Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add freshpod as a new addon #2423

Merged
merged 2 commits into from
Jan 23, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions cmd/minikube/cmd/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,12 @@ var settings = []Setting{
validations: []setFn{IsValidAddon},
callbacks: []setFn{EnableOrDisableAddon},
},
{
name: "freshpod",
set: SetBool,
validations: []setFn{IsValidAddon},
callbacks: []setFn{EnableOrDisableAddon},
},
{
name: "default-storageclass",
set: SetBool,
Expand Down
47 changes: 47 additions & 0 deletions deploy/addons/freshpod/freshpod-rc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# Copyright 2018 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.

apiVersion: v1
kind: ReplicationController
metadata:
name: freshpod
namespace: kube-system
labels:
k8s-app: freshpod
kubernetes.io/minikube-addons: freshpod
addonmanager.kubernetes.io/mode: Reconcile
spec:
replicas: 1
selector:
k8s-app: freshpod
addonmanager.kubernetes.io/mode: Reconcile
template:
metadata:
labels:
Copy link
Member

@ahmetb ahmetb Jan 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need kubernetes.io/minikube-addons: freshpod here as well, so that the Pods get this label, too?
The documentation is unclear.

k8s-app: freshpod
addonmanager.kubernetes.io/mode: Reconcile
spec:
containers:
- name: freshpod
image: gcr.io/google-samples/freshpod:v0.0.1
imagePullPolicy: IfNotPresent
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like other addons also use imagePullPolicy: IfNotPresent , I'm not sure why/if this is the preferred option. It doesn't matter much anyway.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I'm referencing other addons to add this option, so I'm also not sure why this option to need because the addon doc not mention.

volumeMounts:
- name: docker
mountPath: /var/run/docker.sock
volumes:
- name: docker
hostPath:
type: Socket
path: /var/run/docker.sock
terminationGracePeriodSeconds: 1
8 changes: 5 additions & 3 deletions docs/addons.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,18 @@
Minikube has a set of built in addons that can be used enabled, disabled, and opened inside of the local k8s environment. Below is an example of this functionality for the `heapster` addon:
```shell
$ minikube addons list
- storage-provisioner: enabled
- kube-dns: enabled
- registry: disabled
- registry-creds: disabled
- freshpod: disabled
- addon-manager: enabled
- dashboard: disabled
- default-storageclass: enabled
- dashboard: enabled
- coredns: disabled
- heapster: disabled
- efk: disabled
- ingress: disabled
- default-storageclass: enabled
- storage-provisioner: enabled

# minikube must be running for these commands to take effect
$ minikube addons enable heapster
Expand All @@ -34,6 +35,7 @@ The currently supported addons include:
* [Registry Credentials](https://github.com/upmc-enterprises/registry-creds)
* [CoreDNS](https://github.com/coredns/deployment/tree/master/kubernetes)
* [Ingress](https://github.com/kubernetes/ingress-nginx)
* [Freshpod](https://github.com/GoogleCloudPlatform/freshpod)

If you would like to have minikube properly start/restart custom addons, place the addon(s) you wish to be launched with minikube in the `.minikube/addons` directory. Addons in this folder will be moved to the minikube VM and launched each time minikube is started/restarted.

Expand Down
7 changes: 7 additions & 0 deletions pkg/minikube/assets/addons.go
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,13 @@ var Addons = map[string]*Addon{
"registry-creds-rc.yaml",
"0640"),
}, false, "registry-creds"),
"freshpod": NewAddon([]*BinDataAsset{
NewBinDataAsset(
"deploy/addons/freshpod/freshpod-rc.yaml",
constants.AddonsPath,
"freshpod-rc.yaml",
"0640"),
}, false, "freshpod"),
}

func AddMinikubeDirAssets(assets *[]CopyableFile) error {
Expand Down