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.

Sign up for GitHub

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

Jump to bottom

Update genie-controller.go #230

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update genie-controller.go #230

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 3 deletions genie/genie-controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ func ParseCNIConf(confData []byte) (*utils.GenieConf, error) {

// AddPodNetwork adds pod networking. It has logic to parse each pod
// definition's annotations. It looks for container networking solutions (CNS)
// types passed as annotation in pod defintion. For every CNS types, it talks
// types passed as annotation in pod definition. For every CNS types, it talks
// to corresponding CNS object and fetches an IP from it's IPAM.
// It also applies the IP as ethX inside the pod.
func (gc *GenieController) AddPodNetwork(cniArgs *utils.CNIArgs, conf *utils.GenieConf) (types.Result, error) {
Expand Down Expand Up @@ -194,7 +194,7 @@ func (gc *GenieController) AddPodNetwork(cniArgs *utils.CNIArgs, conf *utils.Gen

// DeletePodNetwork deletes pod networking. It has logic to parse each pod
// definition's annotations. It looks for container networking solutions (CNS)
// types passed as annotation in pod defintion. For every CNS types, it talks
// types passed as annotation in pod definition. For every CNS types, it talks
// to corresponding CNS object and releases an IP from it's IPAM.
func (gc *GenieController) DeletePodNetwork(cniArgs *utils.CNIArgs, conf *utils.GenieConf) error {
k8sArgs, err := loadArgs(cniArgs)
Expand Down Expand Up @@ -604,7 +604,7 @@ func (gc *GenieController) loadPluginConfig(plugin string) (*libcni.NetworkConfi
return config, nil
}

// parseCNIAnnotations parses pod yaml defintion for "cni" annotations.
// parseCNIAnnotations parses pod yaml definition for "cni" annotations.
func (gc *GenieController) parseCNIAnnotations(annot map[string]string, k8sArgs *utils.K8sArgs, conf *utils.GenieConf) ([]*utils.PluginInfo, error) {
var finalPluginInfos []*utils.PluginInfo
var err error
Expand Down