Skip to content

Commit

Permalink
Merge pull request #1 from ironsource-mobile/dev
Browse files Browse the repository at this point in the history
Change adpative to adaptive
  • Loading branch information
liorfranko authored Jun 30, 2024
2 parents c11e573 + 5800295 commit d29d0b2
Show file tree
Hide file tree
Showing 19 changed files with 28 additions and 28 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,10 @@ PLATFORMS ?= linux/arm64,linux/amd64,linux/s390x,linux/ppc64le
docker-buildx: ## Build and push docker image for the manager for cross-platform support
# copy existing Dockerfile and insert --platform=${BUILDPLATFORM} into Dockerfile.cross, and preserve the original Dockerfile
sed -e '1 s/\(^FROM\)/FROM --platform=\$$\{BUILDPLATFORM\}/; t' -e ' 1,// s//FROM --platform=\$$\{BUILDPLATFORM\}/' Dockerfile > Dockerfile.cross
- $(CONTAINER_TOOL) buildx create --name istio-adpative-least-request-builder
$(CONTAINER_TOOL) buildx use istio-adpative-least-request-builder
- $(CONTAINER_TOOL) buildx create --name istio-adaptive-least-request-builder
$(CONTAINER_TOOL) buildx use istio-adaptive-least-request-builder
- $(CONTAINER_TOOL) buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross .
- $(CONTAINER_TOOL) buildx rm istio-adpative-least-request-builder
- $(CONTAINER_TOOL) buildx rm istio-adaptive-least-request-builder
rm Dockerfile.cross

.PHONY: build-installer
Expand Down
2 changes: 1 addition & 1 deletion PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
domain: liorfranko.github.io
layout:
- go.kubebuilder.io/v4
projectName: istio-adpative-least-request
projectName: istio-adaptive-least-request
repo: istio-adaptive-least-request
resources:
- api:
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# istio-adpative-least-request
# istio-adaptive-least-request
// TODO(user): Add simple overview of use/purpose

## Description
Expand All @@ -16,7 +16,7 @@
**Build and push your image to the location specified by `IMG`:**

```sh
make docker-build docker-push IMG=<some-registry>/istio-adpative-least-request:tag
make docker-build docker-push IMG=<some-registry>/istio-adaptive-least-request:tag
```

**NOTE:** This image ought to be published in the personal registry you specified.
Expand All @@ -32,7 +32,7 @@ make install
**Deploy the Manager to the cluster with the image specified by `IMG`:**

```sh
make deploy IMG=<some-registry>/istio-adpative-least-request:tag
make deploy IMG=<some-registry>/istio-adaptive-least-request:tag
```

> **NOTE**: If you encounter RBAC errors, you may need to grant yourself cluster-admin
Expand Down Expand Up @@ -73,7 +73,7 @@ Following are the steps to build the installer and distribute this project to us
1. Build the installer for the image built and published in the registry:

```sh
make build-installer IMG=<some-registry>/istio-adpative-least-request:tag
make build-installer IMG=<some-registry>/istio-adaptive-least-request:tag
```

NOTE: The makefile target mentioned above generates an 'install.yaml'
Expand All @@ -86,7 +86,7 @@ its dependencies.
Users can just run kubectl apply -f <URL for YAML BUNDLE> to install the project, i.e.:

```sh
kubectl apply -f https://raw.githubusercontent.com/<org>/istio-adpative-least-request/<tag or branch>/dist/install.yaml
kubectl apply -f https://raw.githubusercontent.com/<org>/istio-adaptive-least-request/<tag or branch>/dist/install.yaml
```

## Contributing
Expand Down
4 changes: 2 additions & 2 deletions config/default/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Adds namespace to all resources.
namespace: istio-adpative-least-request-system
namespace: istio-adaptive-least-request-system

# Value of this field is prepended to the
# names of all resources, e.g. a deployment named
# "wordpress" becomes "alices-wordpress".
# Note that it should also match with the prefix (text before '-') of the namespace
# field above.
namePrefix: istio-adpative-least-request-
namePrefix: istio-adaptive-least-request-

# Labels to add to all resources and selectors.
#labels:
Expand Down
2 changes: 1 addition & 1 deletion config/default/metrics_service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Service
metadata:
labels:
control-plane: controller-manager
app.kubernetes.io/name: istio-adpative-least-request
app.kubernetes.io/name: istio-adaptive-least-request
app.kubernetes.io/managed-by: kustomize
name: controller-manager-metrics-service
namespace: system
Expand Down
4 changes: 2 additions & 2 deletions config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Namespace
metadata:
labels:
control-plane: controller-manager
app.kubernetes.io/name: istio-adpative-least-request
app.kubernetes.io/name: istio-adaptive-least-request
app.kubernetes.io/managed-by: kustomize
name: system
---
Expand All @@ -14,7 +14,7 @@ metadata:
namespace: system
labels:
control-plane: controller-manager
app.kubernetes.io/name: istio-adpative-least-request
app.kubernetes.io/name: istio-adaptive-least-request
app.kubernetes.io/managed-by: kustomize
spec:
selector:
Expand Down
2 changes: 1 addition & 1 deletion config/prometheus/monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ kind: ServiceMonitor
metadata:
labels:
control-plane: controller-manager
app.kubernetes.io/name: istio-adpative-least-request
app.kubernetes.io/name: istio-adaptive-least-request
app.kubernetes.io/managed-by: kustomize
name: controller-manager-metrics-monitor
namespace: system
Expand Down
2 changes: 1 addition & 1 deletion config/rbac/istioadaptiverequestoptimizer_editor_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
app.kubernetes.io/name: istio-adpative-least-request
app.kubernetes.io/name: istio-adaptive-least-request
app.kubernetes.io/managed-by: kustomize
name: istioadaptiverequestoptimizer-editor-role
rules:
Expand Down
2 changes: 1 addition & 1 deletion config/rbac/istioadaptiverequestoptimizer_viewer_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
app.kubernetes.io/name: istio-adpative-least-request
app.kubernetes.io/name: istio-adaptive-least-request
app.kubernetes.io/managed-by: kustomize
name: istioadaptiverequestoptimizer-viewer-role
rules:
Expand Down
2 changes: 1 addition & 1 deletion config/rbac/leader_election_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
labels:
app.kubernetes.io/name: istio-adpative-least-request
app.kubernetes.io/name: istio-adaptive-least-request
app.kubernetes.io/managed-by: kustomize
name: leader-election-role
rules:
Expand Down
2 changes: 1 addition & 1 deletion config/rbac/leader_election_role_binding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
labels:
app.kubernetes.io/name: istio-adpative-least-request
app.kubernetes.io/name: istio-adaptive-least-request
app.kubernetes.io/managed-by: kustomize
name: leader-election-rolebinding
roleRef:
Expand Down
2 changes: 1 addition & 1 deletion config/rbac/role_binding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
labels:
app.kubernetes.io/name: istio-adpative-least-request
app.kubernetes.io/name: istio-adaptive-least-request
app.kubernetes.io/managed-by: kustomize
name: manager-rolebinding
roleRef:
Expand Down
2 changes: 1 addition & 1 deletion config/rbac/service_account.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
kind: ServiceAccount
metadata:
labels:
app.kubernetes.io/name: istio-adpative-least-request
app.kubernetes.io/name: istio-adaptive-least-request
app.kubernetes.io/managed-by: kustomize
name: controller-manager
namespace: system
2 changes: 1 addition & 1 deletion config/rbac/weightoptimizer_editor_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
app.kubernetes.io/name: istio-adpative-least-request
app.kubernetes.io/name: istio-adaptive-least-request
app.kubernetes.io/managed-by: kustomize
name: weightoptimizer-editor-role
rules:
Expand Down
2 changes: 1 addition & 1 deletion config/rbac/weightoptimizer_viewer_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
app.kubernetes.io/name: istio-adpative-least-request
app.kubernetes.io/name: istio-adaptive-least-request
app.kubernetes.io/managed-by: kustomize
name: weightoptimizer-viewer-role
rules:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: optimization.liorfranko.github.io/v1alpha1
kind: IstioAdaptiveRequestOptimizer
metadata:
labels:
app.kubernetes.io/name: istio-adpative-least-request
app.kubernetes.io/name: istio-adaptive-least-request
app.kubernetes.io/managed-by: kustomize
name: istioadaptiverequestoptimizer-sample
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/samples/optimization_v1alpha1_weightoptimizer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: optimization.liorfranko.github.io/v1alpha1
kind: WeightOptimizer
metadata:
labels:
app.kubernetes.io/name: istio-adpative-least-request
app.kubernetes.io/name: istio-adaptive-least-request
app.kubernetes.io/managed-by: kustomize
name: weightoptimizer-sample
spec:
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/e2e_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ import (
// Run e2e tests using the Ginkgo runner.
func TestE2E(t *testing.T) {
RegisterFailHandler(Fail)
fmt.Fprintf(GinkgoWriter, "Starting istio-adpative-least-request suite\n")
fmt.Fprintf(GinkgoWriter, "Starting istio-adaptive-least-request suite\n")
RunSpecs(t, "e2e suite")
}
4 changes: 2 additions & 2 deletions test/e2e/e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"istio-adaptive-least-request/test/utils"
)

const namespace = "istio-adpative-least-request-system"
const namespace = "istio-adaptive-least-request-system"

var _ = Describe("controller", Ordered, func() {
BeforeAll(func() {
Expand Down Expand Up @@ -60,7 +60,7 @@ var _ = Describe("controller", Ordered, func() {
var err error

// projectimage stores the name of the image used in the example
var projectimage = "example.com/istio-adpative-least-request:v0.0.1"
var projectimage = "example.com/istio-adaptive-least-request:v0.0.1"

By("building the manager(Operator) image")
cmd := exec.Command("make", "docker-build", fmt.Sprintf("IMG=%s", projectimage))
Expand Down

0 comments on commit d29d0b2

Please sign in to comment.