Skip to content

Commit 9e087ef

Browse files
authored
Merge pull request #97 from awslabs/introduce/kro
Change the project name to KRO (Kube Resource Orchestrator)
2 parents 3499476 + 148bf5b commit 9e087ef

File tree

152 files changed

+1167
-1189
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+1167
-1189
lines changed

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ Dockerfile.cross
2525
*.swo
2626
*~
2727

28-
symphony-controller
29-
symphony-chart*
28+
kro-controller
29+
kro-chart*
3030
cover.html
3131
.read
3232
.snapshots

ATTRIBUTION.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
[//]: # (File generated by attribution-gen. DO NOT EDIT.)
44

5-
The github.com/aws-controllers-k8s/symphony source code is licensed under the
5+
The github.com/awslabs/kro source code is licensed under the
66
Apache License, version 2.0. A copy of this license is available in the
77
[LICENSE](LICENSE) file in the root source code directory and is included,
8-
along with this document, in any images containing github.com/aws-controllers-k8s/symphony
8+
along with this document, in any images containing github.com/awslabs/kro
99
binaries.
1010

1111
## Package dependencies
1212

13-
The module github.com/aws-controllers-k8s/symphony depends on a number of Open Source Go packages. Direct
13+
The module github.com/awslabs/kro depends on a number of Open Source Go packages. Direct
1414
dependencies are listed in the ./go.mod file.
1515
Those direct package dependencies have some dependencies of their own (known as
1616
"transitive dependencies")

Makefile

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ AWS_REGION ?= us-west-2
44
RELEASE_VERSION ?= dev-$(shell git rev-parse --short HEAD)
55
ECR_REPO ?= ${AWS_ACCOUNT_ID}.dkr.ecr.us-west-2.amazonaws.com
66

7-
CONTROLLER_IMAGE ?= ${ECR_REPO}/symphony:${RELEASE_VERSION}
8-
HELM_IMAGE ?= ${ECR_REPO}/symphony-chart:${RELEASE_VERSION}
9-
DOCS_IMAGE ?= ${ECR_REPO}/symphony-docs:${RELEASE_VERSION}
7+
CONTROLLER_IMAGE ?= ${ECR_REPO}/kro:${RELEASE_VERSION}
8+
HELM_IMAGE ?= ${ECR_REPO}/kro-chart:${RELEASE_VERSION}
9+
DOCS_IMAGE ?= ${ECR_REPO}/kro-docs:${RELEASE_VERSION}
1010

11-
KO_DOCKER_REPO ?= ${ECR_REPO}/symphony
11+
KO_DOCKER_REPO ?= ${ECR_REPO}/kro
1212
KOCACHE ?= ~/.ko
1313
KO_PUSH ?= true
1414

@@ -175,15 +175,15 @@ $(CONTROLLER_GEN): $(LOCALBIN)
175175
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
176176

177177
.PHONY: image
178-
build-image: ## Build the Symphony controller images using ko build
179-
$(WITH_GOFLAGS) KOCACHE=$(KOCACHE) KO_DOCKER_REPO="095708837592.dkr.ecr.us-west-2.amazonaws.com/symphony" \
180-
ko build --bare github.com/awslabs/symphony/cmd/controller \
178+
build-image: ## Build the KRO controller images using ko build
179+
$(WITH_GOFLAGS) KOCACHE=$(KOCACHE) KO_DOCKER_REPO="095708837592.dkr.ecr.us-west-2.amazonaws.com/kro" \
180+
ko build --bare github.com/awslabs/kro/cmd/controller \
181181
--push=false --tags ${RELEASE_VERSION} --sbom=none
182182

183183
.PHONY: publish
184-
publish-image: ## Publish the Symphony controller images to ECR
185-
$(WITH_GOFLAGS) KOCACHE=$(KOCACHE) KO_DOCKER_REPO="095708837592.dkr.ecr.us-west-2.amazonaws.com/symphony" \
186-
ko publish --bare github.com/awslabs/symphony/cmd/controller \
184+
publish-image: ## Publish the KRO controller images to ECR
185+
$(WITH_GOFLAGS) KOCACHE=$(KOCACHE) KO_DOCKER_REPO="095708837592.dkr.ecr.us-west-2.amazonaws.com/kro" \
186+
ko publish --bare github.com/awslabs/kro/cmd/controller \
187187
--tags ${RELEASE_VERSION} --sbom=none
188188

189189
.PHONY: package-helm
@@ -196,7 +196,7 @@ package-helm: ## Package Helm chart
196196

197197
.PHONY: publish-helm
198198
publish-helm: ## Helm publish
199-
helm push ./symphony-chart-${RELEASE_VERSION}.tgz oci://${ECR_REPO}
199+
helm push ./kro-chart-${RELEASE_VERSION}.tgz oci://${ECR_REPO}
200200

201201
.PHONY:
202202
release: build-image publish-image package-helm publish-helm

OWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# See the OWNERS docs at https://go.k8s.io/owners
22

33
approvers:
4-
- symphony-maintainers
4+
- kro-maintainers

OWNERS_ALIASES

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# See the OWNERS docs at https://go.k8s.io/owners#owners_aliases
22

33
aliases:
4-
symphony-maintainers:
4+
kro-maintainers:
55
- a-hilaly
66
- michaelhtm
77
- TiberiuGC

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# Symphony
1+
# KRO
22

33
<p align="center">
44
<img src="./images/logo/final-blue.svg" />
55
</p>
66

7-
Symphony is a Kubernetes controller that simplifies application management and
7+
KRO is a Kubernetes controller that simplifies application management and
88
deployment. It provides a powerful abstraction layer, allowing you to define
99
complex, multi-resource applications as single reusable units.
1010

api/v1alpha1/conditions.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,31 +22,31 @@ type ConditionType string
2222

2323
const (
2424
// ResourceGroupConditionTypeGraphSynced indicates the state of the directed
25-
// acyclic graph (DAG) that Symphony uses to manage the resources in a
25+
// acyclic graph (DAG) that KRO uses to manage the resources in a
2626
// ResourceGroup.
27-
ResourceGroupConditionTypeGraphVerified ConditionType = "symphony.aws.dev/GraphVerified"
27+
ResourceGroupConditionTypeGraphVerified ConditionType = "kro.aws.dev/GraphVerified"
2828
// ResourceGroupConditionTypeCustomResourceDefinitionSynced indicates the state of the
29-
// CustomResourceDefinition (CRD) that Symphony uses to manage the resources in a
29+
// CustomResourceDefinition (CRD) that KRO uses to manage the resources in a
3030
// ResourceGroup.
31-
ResourceGroupConditionTypeCustomResourceDefinitionSynced ConditionType = "symphony.aws.dev/CustomResourceDefinitionSynced"
31+
ResourceGroupConditionTypeCustomResourceDefinitionSynced ConditionType = "kro.aws.dev/CustomResourceDefinitionSynced"
3232
// ResourceGroupConditionTypeReconcilerReady indicates the state of the reconciler.
33-
// Whenever an ResourceGroup resource is created, Symphony will spin up a
33+
// Whenever an ResourceGroup resource is created, KRO will spin up a
3434
// reconciler for that resource. This condition indicates the state of the
3535
// reconciler.
36-
ResourceGroupConditionTypeReconcilerReady ConditionType = "symphony.aws.dev/ReconcilerReady"
36+
ResourceGroupConditionTypeReconcilerReady ConditionType = "kro.aws.dev/ReconcilerReady"
3737
)
3838

3939
const (
40-
InstanceConditionTypeReady ConditionType = "symphony.aws.dev/Ready"
40+
InstanceConditionTypeReady ConditionType = "kro.aws.dev/Ready"
4141

4242
// Creating Deleting Migrating
43-
InstanceConditionTypeProgressing ConditionType = "symphony.aws.dev/Progressing"
43+
InstanceConditionTypeProgressing ConditionType = "kro.aws.dev/Progressing"
4444

4545
// Unexpected situation, behaviour, need human intervention
46-
InstanceConditionTypeDegraded ConditionType = "symphony.aws.dev/Degraded"
46+
InstanceConditionTypeDegraded ConditionType = "kro.aws.dev/Degraded"
4747

4848
// Something is wrong but i'm gonna try again
49-
InstanceConditionTypeError ConditionType = "symphony.aws.dev/Error"
49+
InstanceConditionTypeError ConditionType = "kro.aws.dev/Error"
5050
)
5151

5252
// Condition is the common struct used by all CRDs managed by ACK service

api/v1alpha1/groupversion_info.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,22 @@
1313

1414
// Package v1alpha1 contains API Schema definitions for the x v1alpha1 API group
1515
// +kubebuilder:object:generate=true
16-
// +groupName=x.symphony.k8s.aws
16+
// +groupName=kro.run
1717
package v1alpha1
1818

1919
import (
20-
"fmt"
2120

2221
"k8s.io/apimachinery/pkg/runtime/schema"
2322
"sigs.k8s.io/controller-runtime/pkg/scheme"
2423
)
2524

2625
const (
27-
SymphonyDomainName = "symphony.k8s.aws"
26+
KroDomainName = "kro.run"
2827
)
2928

3029
var (
3130
// GroupVersion is group version used to register these objects
32-
GroupVersion = schema.GroupVersion{Group: fmt.Sprintf("x.%s", SymphonyDomainName), Version: "v1alpha1"}
31+
GroupVersion = schema.GroupVersion{Group: KroDomainName, Version: "v1alpha1"}
3332

3433
// SchemeBuilder is used to add go types to the GroupVersionKind scheme
3534
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

api/v1alpha1/resource_group.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ type Dependency struct {
121121

122122
// +kubebuilder:object:root=true
123123
// +kubebuilder:subresource:status
124-
// +kubebuilder:printcolumn:name="APIVERSION",type=string,priority=0,JSONPath=`.spec.apiVersion`
125-
// +kubebuilder:printcolumn:name="KIND",type=string,priority=0,JSONPath=`.spec.kind`
124+
// +kubebuilder:printcolumn:name="APIVERSION",type=string,priority=0,JSONPath=`.spec.schema.apiVersion`
125+
// +kubebuilder:printcolumn:name="KIND",type=string,priority=0,JSONPath=`.spec.schema.kind`
126126
// +kubebuilder:printcolumn:name="STATE",type=string,priority=0,JSONPath=`.status.state`
127127
// +kubebuilder:printcolumn:name="TOPOLOGICALORDER",type=string,priority=1,JSONPath=`.status.topologicalOrder`
128128
// +kubebuilder:printcolumn:name="AGE",type="date",priority=0,JSONPath=".metadata.creationTimestamp"

cmd/controller/main.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ import (
3030
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
3131
"sigs.k8s.io/controller-runtime/pkg/predicate"
3232

33-
xv1alpha1 "github.com/awslabs/symphony/api/v1alpha1"
34-
resourcegroupctrl "github.com/awslabs/symphony/internal/controller/resourcegroup"
35-
"github.com/awslabs/symphony/internal/dynamiccontroller"
36-
"github.com/awslabs/symphony/internal/graph"
37-
"github.com/awslabs/symphony/internal/kubernetes"
33+
xv1alpha1 "github.com/awslabs/kro/api/v1alpha1"
34+
resourcegroupctrl "github.com/awslabs/kro/internal/controller/resourcegroup"
35+
"github.com/awslabs/kro/internal/dynamiccontroller"
36+
"github.com/awslabs/kro/internal/graph"
37+
"github.com/awslabs/kro/internal/kubernetes"
3838
//+kubebuilder:scaffold:imports
3939
)
4040

@@ -73,7 +73,7 @@ func main() {
7373
flag.BoolVar(&enableLeaderElection, "leader-elect", false,
7474
"Enable leader election for controller manager. "+
7575
"Enabling this will ensure there is only one active controller manager.")
76-
flag.BoolVar(&allowCRDDeletion, "allow-crd-deletion", false, "allow symphony to delete CRDs")
76+
flag.BoolVar(&allowCRDDeletion, "allow-crd-deletion", false, "allow kro to delete CRDs")
7777
flag.IntVar(&resourceGroupConcurrentReconciles, "resource-group-concurrent-reconciles", 1, "The number of resource group reconciles to run in parallel")
7878
flag.IntVar(&dynamicControllerConcurrentReconciles, "dynamic-controller-concurrent-reconciles", 1, "The number of dynamic controller reconciles to run in parallel")
7979
// log level flags
@@ -97,7 +97,7 @@ func main() {
9797
},
9898
HealthProbeBindAddress: probeAddr,
9999
LeaderElection: enableLeaderElection,
100-
LeaderElectionID: "6f0f64a5.symphony.k8s.aws",
100+
LeaderElectionID: "6f0f64a5.kro.run",
101101
// LeaderElectionReleaseOnCancel defines if the leader should step down voluntarily
102102
// when the Manager ends. This requires the binary to immediately end when the
103103
// Manager is stopped, otherwise, this setting is unsafe. Setting this significantly

0 commit comments

Comments
 (0)