Skip to content

Commit

Permalink
Rename all orka references to Keiko (#32)
Browse files Browse the repository at this point in the history
* rename to keiko

* remove file checked-in by mistake
  • Loading branch information
eytan-avisror authored Aug 28, 2019
1 parent 38da010 commit 3b28b69
Show file tree
Hide file tree
Showing 35 changed files with 91 additions and 91 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
# These owners will be the default owners for everything in
# the repo. Unless a later match takes precedence,
# review when someone opens a pull request.
* @orkaproj/authorized-approvers
* @keikoproj/authorized-approvers
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# How to contribute

1. Fork it (<https://github.com/orkaproj/instance-manager/fork>)
1. Fork it (<https://github.com/keikoproj/instance-manager/fork>)
2. Open an issue and discuss the feature / bug
3. Create your feature branch (`git checkout -b feature/fooBar`)
4. Commit your changes (`git commit -am 'Add some fooBar'`)
Expand Down
10 changes: 5 additions & 5 deletions .github/DEVELOPER.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ Using the `Makefile` you can run basic unit tests.
```bash
$ make test

? github.com/orkaproj/instance-manager/controllers [no test files]
? github.com/orkaproj/instance-manager/controllers/common [no test files]
? github.com/orkaproj/instance-manager/controllers/providers/aws [no test files]
? github.com/keikoproj/instance-manager/controllers [no test files]
? github.com/keikoproj/instance-manager/controllers/common [no test files]
? github.com/keikoproj/instance-manager/controllers/providers/aws [no test files]
=== RUN TestStateDiscoveryInitUpdate
--- PASS: TestStateDiscoveryInitUpdate (0.00s)
=== RUN TestStateDiscoveryReconcileModifying
Expand Down Expand Up @@ -88,7 +88,7 @@ $ make test
--- PASS: TestCrdStrategyCRExist (0.00s)
PASS
coverage: 72.6% of statements
ok github.com/orkaproj/instance-manager/controllers/provisioners/ekscloudformation 5.352s coverage: 72.6% of statements
ok github.com/keikoproj/instance-manager/controllers/provisioners/ekscloudformation 5.352s coverage: 72.6% of statements
```

You can use `make vtest` to run test with verbose logging, you can also run `make coverage` to generate a coverage report.
Expand Down Expand Up @@ -125,5 +125,5 @@ Ran 4 of 4 Specs in 635.904 seconds
SUCCESS! -- 4 Passed | 0 Failed | 0 Pending | 0 Skipped
--- PASS: TestE2e (635.90s)
PASS
ok github.com/orkaproj/instance-manager/test-bdd 636.198s
ok github.com/keikoproj/instance-manager/test-bdd 636.198s
```
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
if: type IN (push)
script:
- echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin
- if [ $TRAVIS_EVENT_TYPE = push ]; then export IMG=orkaproj/instance-manager:$TRAVIS_BRANCH; fi
- if [ $TRAVIS_EVENT_TYPE = push ]; then export IMG=keikoproj/instance-manager:$TRAVIS_BRANCH; fi
- make docker-build
- make docker-push

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2017-2018 The Orka Authors
Copyright 2017-2018 The Keiko Authors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion PROJECT
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version: "2"
domain: orkaproj.io
domain: keikoproj.io
repo: _/tmp/instancemanager
resources:
- group: instancemgr
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# instance-manager
[![Build Status](https://travis-ci.org/orkaproj/instance-manager.svg?branch=master)](https://travis-ci.org/orkaproj/instance-manager)
[![codecov](https://codecov.io/gh/orkaproj/instance-manager/branch/master/graph/badge.svg)](https://codecov.io/gh/orkaproj/instance-manager)
[![Go Report Card](https://goreportcard.com/badge/github.com/orkaproj/instance-manager)](https://goreportcard.com/report/github.com/orkaproj/instance-manager)
[![Build Status](https://travis-ci.org/keikoproj/instance-manager.svg?branch=master)](https://travis-ci.org/keikoproj/instance-manager)
[![codecov](https://codecov.io/gh/keikoproj/instance-manager/branch/master/graph/badge.svg)](https://codecov.io/gh/keikoproj/instance-manager)
[![Go Report Card](https://goreportcard.com/badge/github.com/keikoproj/instance-manager)](https://goreportcard.com/report/github.com/keikoproj/instance-manager)
[![slack](https://img.shields.io/badge/slack-join%20the%20conversation-ff69b4.svg)][SlackUrl]
![version](https://img.shields.io/badge/version-0.3.1-blue.svg?cacheSeconds=2592000)
> Create and manage instance groups with Kubernetes.
Expand All @@ -22,7 +22,7 @@ You must first have atleast one instance group that was manually created, in ord

```sh
kubectl create namespace instance-manager
kubectl apply -n instance-manager -f https://raw.githubusercontent.com/orkaproj/instance-manager/master/docs/04_instance-manager.yaml
kubectl apply -n instance-manager -f https://raw.githubusercontent.com/keikoproj/instance-manager/master/docs/04_instance-manager.yaml
```

_For more examples and usage, please refer to the [Installation Reference Walkthrough][install]._
Expand All @@ -42,7 +42,7 @@ To create an instance group, submit an InstanceGroup spec to the controller.
### Sample spec

```yaml
apiVersion: instancemgr.orkaproj.io/v1alpha1
apiVersion: instancemgr.keikoproj.io/v1alpha1
kind: InstanceGroup
metadata:
name: hello-world
Expand Down Expand Up @@ -84,7 +84,7 @@ spec:
```sh
$ kubectl create -f instance_group.yaml
instancegroup.instancemgr.orkaproj.io/hello-world created
instancegroup.instancemgr.keikoproj.io/hello-world created

$ kubectl get instancegroups
NAME STATE MIN MAX GROUP NAME PROVISIONER AGE
Expand Down Expand Up @@ -115,5 +115,5 @@ Please see [CONTRIBUTING.md](.github/CONTRIBUTING.md).
Please see [DEVELOPER.md](.github/DEVELOPER.md).

<!-- Markdown link -->
[install]: https://github.com/orkaproj/instance-manager/blob/master/docs/README.md
[SlackUrl]: https://orkaproj.slack.com/messages/instance-manager
[install]: https://github.com/keikoproj/instance-manager/blob/master/docs/README.md
[SlackUrl]: https://keikoproj.slack.com/messages/instance-manager
4 changes: 2 additions & 2 deletions api/v1alpha1/groupversion_info.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ limitations under the License.

// Package v1alpha1 contains API Schema definitions for the instancemgr v1alpha1 API group
// +kubebuilder:object:generate=true
// +groupName=instancemgr.orkaproj.io
// +groupName=instancemgr.keikoproj.io
package v1alpha1

import (
Expand All @@ -25,7 +25,7 @@ import (

var (
// GroupVersion is group version used to register these objects
GroupVersion = schema.GroupVersion{Group: "instancemgr.orkaproj.io", Version: "v1alpha1"}
GroupVersion = schema.GroupVersion{Group: "instancemgr.keikoproj.io", Version: "v1alpha1"}

// SchemeBuilder is used to add go types to the GroupVersionKind scheme
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
creationTimestamp: null
name: instancegroups.instancemgr.orkaproj.io
name: instancegroups.instancemgr.keikoproj.io
spec:
additionalPrinterColumns:
- JSONPath: .status.currentState
Expand Down Expand Up @@ -35,7 +35,7 @@ spec:
description: time passed since instancegroup creation
name: Age
type: date
group: instancemgr.orkaproj.io
group: instancemgr.keikoproj.io
names:
kind: InstanceGroup
plural: instancegroups
Expand Down
2 changes: 1 addition & 1 deletion config/crd/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# since it depends on service name and namespace that are out of this kustomize package.
# It should be run by config/default
resources:
- bases/instancemgr.orkaproj.io_instancegroups.yaml
- bases/instancemgr.keikoproj.io_instancegroups.yaml
# +kubebuilder:scaffold:crdkustomizeresource

patches:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/patches/cainjection_in_instancegroups.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ kind: CustomResourceDefinition
metadata:
annotations:
certmanager.k8s.io/inject-ca-from: $(NAMESPACE)/$(CERTIFICATENAME)
name: instancegroups.instancemgr.orkaproj.io
name: instancegroups.instancemgr.keikoproj.io
2 changes: 1 addition & 1 deletion config/crd/patches/webhook_in_instancegroups.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: instancegroups.instancemgr.orkaproj.io
name: instancegroups.instancemgr.keikoproj.io
spec:
conversion:
strategy: Webhook
Expand Down
4 changes: 2 additions & 2 deletions config/rbac/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ rules:
- patch
- delete
- apiGroups:
- instancemgr.orkaproj.io
- instancemgr.keikoproj.io
resources:
- instancegroups
verbs:
Expand All @@ -43,7 +43,7 @@ rules:
- patch
- delete
- apiGroups:
- instancemgr.orkaproj.io
- instancemgr.keikoproj.io
resources:
- instancegroups/status
verbs:
Expand Down
2 changes: 1 addition & 1 deletion config/samples/instancemgr_v1alpha1_instancegroup.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: instancemgr.orkaproj.io/v1alpha1
apiVersion: instancemgr.keikoproj.io/v1alpha1
kind: InstanceGroup
metadata:
labels:
Expand Down
14 changes: 7 additions & 7 deletions controllers/instancegroup_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"

v1alpha "github.com/orkaproj/instance-manager/api/v1alpha1"
"github.com/orkaproj/instance-manager/controllers/common"
"github.com/orkaproj/instance-manager/controllers/providers/aws"
"github.com/orkaproj/instance-manager/controllers/provisioners/ekscloudformation"
v1alpha "github.com/keikoproj/instance-manager/api/v1alpha1"
"github.com/keikoproj/instance-manager/controllers/common"
"github.com/keikoproj/instance-manager/controllers/providers/aws"
"github.com/keikoproj/instance-manager/controllers/provisioners/ekscloudformation"
"k8s.io/apimachinery/pkg/api/errors"
)

Expand Down Expand Up @@ -245,8 +245,8 @@ func (r *InstanceGroupReconciler) ReconcileEKSCF(instanceGroup *v1alpha.Instance

// +kubebuilder:rbac:groups=core,resources=configmaps,verbs=get;list;watch;create;update;patch;delete
// +kubebuilder:rbac:groups=apiextensions.k8s.io,resources=customresourcedefinitions,verbs=get;list;watch;create;update;patch;delete
// +kubebuilder:rbac:groups=instancemgr.orkaproj.io,resources=instancegroups,verbs=get;list;watch;create;update;patch;delete
// +kubebuilder:rbac:groups=instancemgr.orkaproj.io,resources=instancegroups/status,verbs=get;update;patch
// +kubebuilder:rbac:groups=instancemgr.keikoproj.io,resources=instancegroups,verbs=get;list;watch;create;update;patch;delete
// +kubebuilder:rbac:groups=instancemgr.keikoproj.io,resources=instancegroups/status,verbs=get;update;patch

func (r *InstanceGroupReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
_ = context.Background()
Expand Down Expand Up @@ -279,7 +279,7 @@ func (r *InstanceGroupReconciler) Reconcile(req ctrl.Request) (ctrl.Result, erro
log.Infof("resource provisioner: %v", strings.ToLower(ig.Spec.Provisioner))

// Add Finalizer if not present, and set the initial state
finalizerName := fmt.Sprintf("finalizers.%v.instancegroups.orkaproj.io", ig.Spec.Provisioner)
finalizerName := fmt.Sprintf("finalizers.%v.instancegroups.keikoproj.io", ig.Spec.Provisioner)
r.SetFinalizer(ig, finalizerName)

switch strings.ToLower(ig.Spec.Provisioner) {
Expand Down
2 changes: 1 addition & 1 deletion controllers/provisioners/ekscloudformation/bootstrap.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package ekscloudformation
import (
"reflect"

"github.com/orkaproj/instance-manager/api/v1alpha1"
"github.com/keikoproj/instance-manager/api/v1alpha1"

yaml "gopkg.in/yaml.v2"
corev1 "k8s.io/api/core/v1"
Expand Down
14 changes: 7 additions & 7 deletions controllers/provisioners/ekscloudformation/ekscloudformation.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,22 @@ import (

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/cloudformation"
"github.com/orkaproj/instance-manager/api/v1alpha1"
"github.com/orkaproj/instance-manager/controllers/common"
awsprovider "github.com/orkaproj/instance-manager/controllers/providers/aws"
"github.com/keikoproj/instance-manager/api/v1alpha1"
"github.com/keikoproj/instance-manager/controllers/common"
awsprovider "github.com/keikoproj/instance-manager/controllers/providers/aws"
"github.com/sirupsen/logrus"
)

var (
log = logrus.New()
tagClusterName = "instancegroups.orkaproj.io/ClusterName"
tagInstanceGroupName = "instancegroups.orkaproj.io/InstanceGroup"
tagClusterNamespace = "instancegroups.orkaproj.io/Namespace"
tagClusterName = "instancegroups.keikoproj.io/ClusterName"
tagInstanceGroupName = "instancegroups.keikoproj.io/InstanceGroup"
tagClusterNamespace = "instancegroups.keikoproj.io/Namespace"
outputLaunchConfiguration = "LaunchConfigName"
outputScalingGroupName = "AsgName"
outputGroupARN = "NodeInstanceRole"
groupVersionResource = schema.GroupVersionResource{
Group: "instancemgr.orkaproj.io",
Group: "instancemgr.keikoproj.io",
Version: "v1alpha1",
Resource: "instancegroups",
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ import (
"github.com/aws/aws-sdk-go/service/cloudformation/cloudformationiface"
"github.com/aws/aws-sdk-go/service/eks"
"github.com/aws/aws-sdk-go/service/eks/eksiface"
"github.com/orkaproj/instance-manager/api/v1alpha1"
"github.com/orkaproj/instance-manager/controllers/common"
awsprovider "github.com/orkaproj/instance-manager/controllers/providers/aws"
"github.com/keikoproj/instance-manager/api/v1alpha1"
"github.com/keikoproj/instance-manager/controllers/common"
awsprovider "github.com/keikoproj/instance-manager/controllers/providers/aws"
yaml "gopkg.in/yaml.v2"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand All @@ -54,9 +54,9 @@ var loggingEnabled bool
var rollupCrd = `apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: rollingupgrade.upgrademgr.orkaproj.io
name: rollingupgrade.upgrademgr.keikoproj.io
spec:
group: upgrademgr.orkaproj.io
group: upgrademgr.keikoproj.io
names:
kind: RollingUpgrade
plural: rollups
Expand All @@ -81,7 +81,7 @@ func init() {
}

func getRollupSpec(name string) string {
var rollupSpec = fmt.Sprintf(`apiVersion: upgrademgr.orkaproj.io/v1alpha1
var rollupSpec = fmt.Sprintf(`apiVersion: upgrademgr.keikoproj.io/v1alpha1
kind: RollingUpgrade
metadata:
name: %v
Expand Down Expand Up @@ -326,13 +326,13 @@ func createFakeStack(f FakeStack) *cloudformation.Stack {

f.StackTags = []map[string]string{
{
"instancegroups.orkaproj.io/ClusterName": f.ClusterName,
"instancegroups.keikoproj.io/ClusterName": f.ClusterName,
},
{
"instancegroups.orkaproj.io/InstanceGroup": f.ResourceName,
"instancegroups.keikoproj.io/InstanceGroup": f.ResourceName,
},
{
"instancegroups.orkaproj.io/Namespace": f.NamespaceName,
"instancegroups.keikoproj.io/Namespace": f.NamespaceName,
},
}

Expand Down
6 changes: 3 additions & 3 deletions controllers/provisioners/ekscloudformation/strategy.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"strings"
"time"

"github.com/orkaproj/instance-manager/api/v1alpha1"
"github.com/orkaproj/instance-manager/controllers/common"
"github.com/keikoproj/instance-manager/api/v1alpha1"
"github.com/keikoproj/instance-manager/controllers/common"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
Expand All @@ -32,7 +32,7 @@ import (

const (
OwnershipAnnotationKey = "app.kubernetes.io/managed-by"
ScopeAnnotationKey = "instancemgr.orkaproj.io/upgrade-scope"
ScopeAnnotationKey = "instancemgr.keikoproj.io/upgrade-scope"
OwnershipAnnotationValue = "instance-manager"
DefaultConcurrencyPolicy = "forbid"
)
Expand Down
6 changes: 3 additions & 3 deletions controllers/provisioners/ekscloudformation/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (

"github.com/aws/aws-sdk-go/service/autoscaling"
"github.com/aws/aws-sdk-go/service/cloudformation"
"github.com/orkaproj/instance-manager/api/v1alpha1"
"github.com/orkaproj/instance-manager/controllers/common"
"github.com/orkaproj/instance-manager/controllers/providers/aws"
"github.com/keikoproj/instance-manager/api/v1alpha1"
"github.com/keikoproj/instance-manager/controllers/common"
"github.com/keikoproj/instance-manager/controllers/providers/aws"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
)

Expand Down
Loading

0 comments on commit 3b28b69

Please sign in to comment.