Skip to content

Commit

Permalink
more name updates to kip
Browse files Browse the repository at this point in the history
  • Loading branch information
justnoise committed Mar 11, 2020
1 parent 395115f commit 9ad2889
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ RUN apk add --update bash ca-certificates iptables

COPY virtual-kubelet /virtual-kubelet
RUN chmod 755 /virtual-kubelet
COPY milpactl /kipctl
COPY kipctl /kipctl
RUN chmod 755 /kipctl

ENTRYPOINT ["/virtual-kubelet"]
6 changes: 3 additions & 3 deletions cmd/kipctl/kipctl.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@ import (
)

const (
cliName = "milpactl"
cliDescription = "Command line client for Milpa framework."
cliName = "kipctl"
cliDescription = "Command line client for Kip provider"
defaultEndpoint = "localhost:54555"
)

var (
rootCmd = &cobra.Command{
Use: cliName,
Short: cliDescription,
SuggestFor: []string{"milpactl"},
SuggestFor: []string{"kipctl"},
Run: func(cmd *cobra.Command, args []string) {
goflag.CommandLine.Parse([]string{})
if version {
Expand Down
2 changes: 1 addition & 1 deletion cmd/virtual-kubelet/flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ type ServerConfig struct {

func (c *ServerConfig) FlagSet() *pflag.FlagSet {
flags := pflag.NewFlagSet("serverconfig", pflag.ContinueOnError)
flags.BoolVar(&c.DebugServer, "debug-server", c.DebugServer, "Enable a listener in the server for inspecting internal milpa structures.")
flags.BoolVar(&c.DebugServer, "debug-server", c.DebugServer, "Enable a listener in the server for inspecting internal kip structures.")
flags.StringVar(&c.NetworkAgentSecret, "network-agent-secret", c.NetworkAgentSecret, "Service account secret for the cell network agent, in the form of <namespace>/<name>")
return flags
}
6 changes: 3 additions & 3 deletions pkg/etcd/etcd.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import (
)

var (
DefaultEtcdDataDir = "/opt/milpa/data"
DefaultEtcdDataDir = "/opt/kip/data"
contextDeadline = 10 * time.Second
)

Expand All @@ -50,10 +50,10 @@ type EtcdServer struct {

func ensureEtcdDataDir(dataDir string) error {
// if it exists, cool, if it doesn't exist, set it up
errMsg := fmt.Sprintf("Could not create milpa storage directory at %s, please verify the directory exists and is writable by milpa. The error was", dataDir)
errMsg := fmt.Sprintf("Could not create kip storage directory at %s, please verify the directory exists and is writable by kip. The error was", dataDir)
_, err := os.Stat(dataDir)
if os.IsNotExist(err) {
klog.V(2).Infof("Creating milpa data directory at %s", dataDir)
klog.V(2).Infof("Creating kip data directory at %s", dataDir)
err := os.MkdirAll(dataDir, 0750)
if err != nil {
return util.WrapError(err, errMsg)
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/cloud/aws/container_instances.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ var (
)

func MakeFamilyPrefix(controllerID string) string {
return "milpa-" + controllerID
return "kip-" + controllerID
}

func makeFamilyName(controllerID, podName string) string {
Expand Down
6 changes: 3 additions & 3 deletions pkg/server/cloud/aws/container_instances_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@ func TestSplitTaskDef(t *testing.T) {
revision int
}{
{
arn: "arn:aws:ecs:us-east-1:689494258501:task-definition/milpa-yav6wbd6vfehrkm2gcmqoirsk4_default_hellofargate:4",
arn: "arn:aws:ecs:us-east-1:689494258501:task-definition/kip-yav6wbd6vfehrkm2gcmqoirsk4_default_hellofargate:4",
name: "default_hellofargate",
revision: 4,
},
{
arn: "arn:aws:ecs:us-east-1:689494258501:task-definition/milpa-differentcluster_default_hellofargate:4",
arn: "arn:aws:ecs:us-east-1:689494258501:task-definition/kip-differentcluster_default_hellofargate:4",
name: "",
revision: 0,
},
{
arn: "arn:aws:ecs:us-east-1:689494258501:task-definition/milpa-yav6wbd6vfehrkm2gcmqoirsk4-default_hellofargate:4",
arn: "arn:aws:ecs:us-east-1:689494258501:task-definition/kip-yav6wbd6vfehrkm2gcmqoirsk4-default_hellofargate:4",
name: "",
revision: 0,
},
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/cloud/aws/instances.go
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ func (e *AwsEC2) GetImageId(tags cloud.BootImageTags) (string, error) {
tags.Company = "elotl"
}
if tags.Product == "" {
tags.Product = "milpa"
tags.Product = "kip"
}
input := &ec2.DescribeImagesInput{
Owners: []*string{
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
)

var (
// VERSION is set during the build from the file at milpa/version
// VERSION is set during the build from the file at kip/version
VERSION string = ""
// GIT_REVISION and GIT_DIRTY are set during build.
GIT_REVISION string = ""
Expand Down

0 comments on commit 9ad2889

Please sign in to comment.