Skip to content

Commit 74ec9cd

Browse files
committed
Remove dapr-sandbox leftovers
Signed-off-by: Luca Burgazzoli <[email protected]>
1 parent 91fd9e4 commit 74ec9cd

File tree

73 files changed

+248
-226
lines changed

Some content is hidden

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

73 files changed

+248
-226
lines changed

.github/workflows/build-main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ jobs:
3030
version: "${{ github.ref_name }}-${{ github.sha }}"
3131
olm: false
3232
secrets:
33-
registry: "quay.io"
34-
registry-username: ${{ secrets.QUAY_USERNAME }}
35-
registry-password: ${{ secrets.QUAY_PASSWORD }}
33+
registry: "ghcr.io"
34+
registry-username: ${{ github.actor }}
35+
registry-password: ${{ github.token }}

.github/workflows/e2e-olm.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ jobs:
7777
config: test/e2e/kind.yaml
7878
- name: 'SetUp Kind Ingress'
7979
run: |
80-
./hack/scripts/deploy_ingress.sh
80+
make deploy/e2e/ingress
8181
- name: "SetUp Dapr Kubernetes Operator OLM"
8282
run: |
83-
./hack/scripts/deploy_olm.sh
83+
make deploy/e2e/olm
8484
- name: "Publish Dapr test Application"
8585
run: |
8686
make test/e2e/app

.github/workflows/e2e-operator.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ jobs:
5757
config: test/e2e/kind.yaml
5858
- name: 'SetUp Kind Ingress'
5959
run: |
60-
./hack/scripts/deploy_ingress.sh
60+
make deploy/e2e/ingress
6161
- name: "SetUp Dapr Kubernetes Operator"
6262
run: |
63-
./hack/scripts/deploy_e2e.sh
63+
make deploy/e2e/controller
6464
- name: "Publish Dapr test Application"
6565
run: |
6666
make test/e2e/app

.github/workflows/publish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ jobs:
3434
- name: "Login to Container registry"
3535
uses: docker/login-action@v3
3636
with:
37-
registry: ghcr.io
38-
username: ${{ github.actor }}
39-
password: ${{ github.token }}
37+
registry: ${{ secrets.registry }}
38+
username: ${{ secrets.registry-username }}
39+
password: ${{ secrets.registry-password }}
4040
- name: Set versions
4141
run: |
4242
export INPUT_VERSION="${{ inputs.version }}"

Makefile

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11

2-
PROJECT_NAME ?= dapr-kubernetes-operator
2+
PROJECT_NAME ?= kubernetes-operator
33
PROJECT_VERSION ?= 0.0.8
44

55
CONTAINER_REGISTRY ?= ghcr.io
6-
CONTAINER_REGISTRY_ORG ?= dapr-sandbox
6+
CONTAINER_REGISTRY_ORG ?= dapr
77
CONTAINER_IMAGE_VERSION ?= $(PROJECT_VERSION)
88
CONTAINER_IMAGE ?= $(CONTAINER_REGISTRY)/$(CONTAINER_REGISTRY_ORG)/$(PROJECT_NAME):$(CONTAINER_IMAGE_VERSION)
99

10+
11+
BUNDLE_NAME ?= dapr-kubernetes-operator
1012
BUNDLE_VERSION ?= $(PROJECT_VERSION)
1113
BUNDLE_CONTAINER_IMAGE ?= $(CONTAINER_REGISTRY)/$(CONTAINER_REGISTRY_ORG)/$(PROJECT_NAME)-bundle:$(BUNDLE_VERSION)
1214

@@ -133,7 +135,6 @@ test/e2e/operator: manifests generate fmt vet ## Run e2e operator tests.
133135
test/e2e/olm: ## Run e2e catalog tests.
134136
DAPR_HELM_CHART_VERSION="$(HELM_CHART_VERSION)" go test -ldflags="$(GOLDFLAGS)" -p 1 -v ./test/e2e/olm/...
135137

136-
137138
.PHONY: test/e2e/app
138139
test/e2e/app: ko ## Deploy test app.
139140
KO_DOCKER_REPO=kind.local $(LOCALBIN)/ko build -B ./test/e2e/support/dapr-test-app
@@ -224,17 +225,31 @@ deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in
224225
undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
225226
$(KUSTOMIZE) build config/deploy/standalone | $(KUBECTL) delete --ignore-not-found=$(ignore-not-found) -f -
226227

227-
228-
.PHONY: deploy/e2e
229-
deploy/e2e: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
230-
cd config/manager && $(KUSTOMIZE) edit set image controller=$(CONTAINER_IMAGE)
231-
$(KUSTOMIZE) build config/deploy/e2e | kubectl apply -f -
232228
.PHONY: deploy/kind
233229
deploy/kind: manifests kustomize kind ## Deploy controller to the K8s cluster specified in ~/.kube/config.
234230
cd config/manager && $(KUSTOMIZE) edit set image controller=$(CONTAINER_IMAGE)
235231
kind load docker-image $(CONTAINER_IMAGE)
236232
$(KUSTOMIZE) build config/deploy/standalone | kubectl apply -f -
237233

234+
.PHONY: deploy/e2e/controller
235+
deploy/e2e/controller: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
236+
cd config/manager && $(KUSTOMIZE) edit set image controller=$(CONTAINER_IMAGE)
237+
$(KUSTOMIZE) build config/deploy/e2e | kubectl apply -f -
238+
239+
kubectl wait \
240+
--namespace=dapr-system \
241+
--for=condition=ready \
242+
pod \
243+
--selector=control-plane=dapr-control-plane \
244+
--timeout=90s
245+
246+
.PHONY: deploy/e2e/ingress
247+
deploy/e2e/ingress:
248+
$(PROJECT_PATH)/hack/scripts/deploy_ingress.sh
249+
250+
.PHONY: deploy/e2e/olm
251+
deploy/e2e/olm:
252+
$(PROJECT_PATH)/hack/scripts/deploy_olm.sh
238253

239254
##@ Bundles
240255

@@ -248,7 +263,7 @@ bundle/generate: generate manifests kustomize operator-sdk yq ## Generate bundle
248263
cd config/manager && $(KUSTOMIZE) edit set image controller=$(CONTAINER_IMAGE)
249264
$(PROJECT_PATH)/hack/scripts/gen_bundle.sh \
250265
$(PROJECT_PATH) \
251-
$(PROJECT_NAME) \
266+
$(BUNDLE_NAME) \
252267
$(BUNDLE_VERSION) \
253268
$(OPENSHIFT_VERSIONS)
254269

PROJECT

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ layout:
77
- go.kubebuilder.io/v4
88
multigroup: true
99
projectName: dapr-kubernetes-operator
10-
repo: github.com/dapr-sandbox/dapr-kubernetes-operator
10+
repo: github.com/dapr/kubernetes-operator
1111
resources:
1212
- api:
1313
crdVersion: v1
@@ -16,22 +16,22 @@ resources:
1616
domain: dapr.io
1717
group: operator
1818
kind: DaprControlPlane
19-
path: github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1
19+
path: github.com/dapr/kubernetes-operator/api/operator/v1alpha1
2020
version: v1alpha1
2121
- api:
2222
crdVersion: v1
2323
namespaced: true
2424
domain: dapr.io
2525
group: operator
2626
kind: DaprInstance
27-
path: github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1
27+
path: github.com/dapr/kubernetes-operator/api/operator/v1alpha1
2828
version: v1alpha1
2929
- api:
3030
crdVersion: v1
3131
namespaced: true
3232
domain: dapr.io
3333
group: operator
3434
kind: DaprCruiseControl
35-
path: github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1
35+
path: github.com/dapr/kubernetes-operator/api/operator/v1alpha1
3636
version: v1alpha1
3737
version: "3"

api/operator/v1alpha1/dapr_control_plane_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package v1alpha1
1818

1919
import (
20-
"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/conditions"
20+
"github.com/dapr/kubernetes-operator/pkg/conditions"
2121
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2222
)
2323

api/operator/v1alpha1/dapr_cruise_control_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package v1alpha1
1818

1919
import (
20-
"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/conditions"
20+
"github.com/dapr/kubernetes-operator/pkg/conditions"
2121
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2222
)
2323

api/operator/v1alpha1/dapr_instance_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package v1alpha1
1818

1919
import (
20-
"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/conditions"
20+
"github.com/dapr/kubernetes-operator/pkg/conditions"
2121
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2222
)
2323

api/operator/v1alpha1/groupversion_info.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ limitations under the License.
2020
package v1alpha1
2121

2222
import (
23-
"github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator"
23+
"github.com/dapr/kubernetes-operator/api/operator"
2424
"k8s.io/apimachinery/pkg/runtime/schema"
2525
"sigs.k8s.io/controller-runtime/pkg/scheme"
2626
)

api/operator/v1alpha1/zz_generated.deepcopy.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"flag"
2121
"os"
2222

23-
"github.com/dapr-sandbox/dapr-kubernetes-operator/cmd/run"
24-
"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/logger"
23+
"github.com/dapr/kubernetes-operator/cmd/run"
24+
"github.com/dapr/kubernetes-operator/pkg/logger"
2525

2626
"github.com/spf13/cobra"
2727

cmd/run/run.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55

66
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
77

8-
"github.com/dapr-sandbox/dapr-kubernetes-operator/internal/controller/operator/controlplane"
9-
"github.com/dapr-sandbox/dapr-kubernetes-operator/internal/controller/operator/instance"
10-
"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/helm"
8+
"github.com/dapr/kubernetes-operator/internal/controller/operator/controlplane"
9+
"github.com/dapr/kubernetes-operator/internal/controller/operator/instance"
10+
"github.com/dapr/kubernetes-operator/pkg/helm"
1111

1212
"github.com/spf13/cobra"
1313
admregv1 "k8s.io/api/admissionregistration/v1"
@@ -19,8 +19,8 @@ import (
1919
rtclient "sigs.k8s.io/controller-runtime/pkg/client"
2020
"sigs.k8s.io/controller-runtime/pkg/manager"
2121

22-
daprApi "github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1"
23-
"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller"
22+
daprApi "github.com/dapr/kubernetes-operator/api/operator/v1alpha1"
23+
"github.com/dapr/kubernetes-operator/pkg/controller"
2424
)
2525

2626
func init() {

config/manifests/bases/dapr-kubernetes-operator.clusterserviceversion.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
capabilities: "Basic Install"
77
categories: "Application Runtime"
88
certified: "false"
9-
repository: "https://github.com/dapr-sandbox/dapr-kubernetes-operator"
9+
repository: "https://github.com/dapr/kubernetes-operator"
1010
containerImage: ""
1111
1212
description: "Dapr Control Plane Operator"
@@ -56,7 +56,7 @@ spec:
5656
- name: Dapr
5757
url: https://dapr.io
5858
- name: Dapr Kubernetes Operator
59-
url: https://github.com/dapr-sandbox/dapr-kubernetes-operator
59+
url: https://github.com/dapr/kubernetes-operator
6060
maintainers:
6161
- email: "[email protected]"
6262
name: "Luca Burgazzoli"

docs/install/olm.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ That's it, OLM should be installed and availble to manage the Dapr Operator.
6565

6666
## Operator Install
6767

68-
The [dapr-kubernetes-operator](https://github.com/dapr-sandbox/dapr-kubernetes-operator/) provides a pre-made kustomization file to deploy the Dapr Kubernetes Operator with OLM:
68+
The [dapr-kubernetes-operator](https://github.com/dapr/kubernetes-operator/) provides a pre-made kustomization file to deploy the Dapr Kubernetes Operator with OLM:
6969

7070
```bash
71-
kubectl apply -k https://github.com/dapr-sandbox/dapr-kubernetes-operator//config/samples/olm
71+
kubectl apply -k https://github.com/dapr/kubernetes-operator//config/samples/olm
7272
```
7373

7474
This command should:
@@ -109,5 +109,5 @@ Once the operator is installed and running, new `DaprControlPlane` resources can
109109
You can clean up the operator resources by running the following commands.
110110

111111
```bash
112-
kubectl delete -k https://github.com/dapr-sandbox/dapr-kubernetes-operator//config/samples/olm
112+
kubectl delete -k https://github.com/dapr/kubernetes-operator//config/samples/olm
113113
```

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/dapr-sandbox/dapr-kubernetes-operator
1+
module github.com/dapr/kubernetes-operator
22

33
go 1.22.5
44

hack/scripts/deploy_e2e.sh

Lines changed: 0 additions & 12 deletions
This file was deleted.

hack/scripts/gen_client.sh

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,35 +16,35 @@ echo "applyconfiguration-gen"
1616
"${PROJECT_ROOT}"/bin/applyconfiguration-gen \
1717
--go-header-file="${PROJECT_ROOT}/hack/boilerplate.go.txt" \
1818
--output-dir="${TMP_DIR}/client/applyconfiguration" \
19-
--output-pkg=github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/applyconfiguration \
20-
github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1
19+
--output-pkg=github.com/dapr/kubernetes-operator/pkg/client/applyconfiguration \
20+
github.com/dapr/kubernetes-operator/api/operator/v1alpha1
2121

2222
echo "client-gen"
2323
"${PROJECT_ROOT}"/bin/client-gen \
2424
--go-header-file="${PROJECT_ROOT}/hack/boilerplate.go.txt" \
2525
--output-dir="${TMP_DIR}/client/clientset" \
26-
--input-base=github.com/dapr-sandbox/dapr-kubernetes-operator/api \
26+
--input-base=github.com/dapr/kubernetes-operator/api \
2727
--input=operator/v1alpha1 \
2828
--fake-clientset=false \
2929
--clientset-name "versioned" \
30-
--apply-configuration-package=github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/applyconfiguration \
31-
--output-pkg=github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/clientset
30+
--apply-configuration-package=github.com/dapr/kubernetes-operator/pkg/client/applyconfiguration \
31+
--output-pkg=github.com/dapr/kubernetes-operator/pkg/client/clientset
3232

3333
echo "lister-gen"
3434
"${PROJECT_ROOT}"/bin/lister-gen \
3535
--go-header-file="${PROJECT_ROOT}/hack/boilerplate.go.txt" \
3636
--output-dir="${TMP_DIR}/client/listers" \
37-
--output-pkg=github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/listers \
38-
github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1
37+
--output-pkg=github.com/dapr/kubernetes-operator/pkg/client/listers \
38+
github.com/dapr/kubernetes-operator/api/operator/v1alpha1
3939

4040
echo "informer-gen"
4141
"${PROJECT_ROOT}"/bin/informer-gen \
4242
--go-header-file="${PROJECT_ROOT}/hack/boilerplate.go.txt" \
4343
--output-dir="${TMP_DIR}/client/informers" \
44-
--versioned-clientset-package=github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/clientset/versioned \
45-
--listers-package=github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/listers \
46-
--output-pkg=github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/informers \
47-
github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1
44+
--versioned-clientset-package=github.com/dapr/kubernetes-operator/pkg/client/clientset/versioned \
45+
--listers-package=github.com/dapr/kubernetes-operator/pkg/client/listers \
46+
--output-pkg=github.com/dapr/kubernetes-operator/pkg/client/informers \
47+
github.com/dapr/kubernetes-operator/api/operator/v1alpha1
4848

4949
# This should not be needed but for some reasons, the applyconfiguration-gen tool
5050
# sets a wrong APIVersion for the Dapr type (operator/v1alpha1 instead of the one with

internal/controller/operator/controlplane/dapr_controlplane_controller.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import (
2222

2323
"sigs.k8s.io/controller-runtime/pkg/reconcile"
2424

25-
"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/openshift"
25+
"github.com/dapr/kubernetes-operator/pkg/openshift"
2626

27-
"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/helm"
27+
"github.com/dapr/kubernetes-operator/pkg/helm"
2828

2929
"k8s.io/client-go/tools/record"
3030

@@ -34,9 +34,9 @@ import (
3434
"sigs.k8s.io/controller-runtime/pkg/builder"
3535
"sigs.k8s.io/controller-runtime/pkg/predicate"
3636

37-
daprApi "github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1"
38-
"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller"
39-
"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller/client"
37+
daprApi "github.com/dapr/kubernetes-operator/api/operator/v1alpha1"
38+
"github.com/dapr/kubernetes-operator/pkg/controller"
39+
"github.com/dapr/kubernetes-operator/pkg/controller/client"
4040
"github.com/go-logr/logr"
4141

4242
ctrlRt "sigs.k8s.io/controller-runtime"

internal/controller/operator/controlplane/dapr_controlplane_controller_action_apply.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ import (
44
"context"
55
"fmt"
66

7-
"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller"
7+
"github.com/dapr/kubernetes-operator/pkg/controller"
88

9-
"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/resources"
9+
"github.com/dapr/kubernetes-operator/pkg/resources"
1010

11-
"github.com/dapr-sandbox/dapr-kubernetes-operator/internal/controller/operator/instance"
11+
"github.com/dapr/kubernetes-operator/internal/controller/operator/instance"
1212
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1313

14-
daprApi "github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1"
15-
daprAc "github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/applyconfiguration/operator/v1alpha1"
14+
daprApi "github.com/dapr/kubernetes-operator/api/operator/v1alpha1"
15+
daprAc "github.com/dapr/kubernetes-operator/pkg/client/applyconfiguration/operator/v1alpha1"
1616

17-
"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller/client"
18-
"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller/predicates"
17+
"github.com/dapr/kubernetes-operator/pkg/controller/client"
18+
"github.com/dapr/kubernetes-operator/pkg/controller/predicates"
1919
"github.com/go-logr/logr"
2020
"sigs.k8s.io/controller-runtime/pkg/builder"
2121
"sigs.k8s.io/controller-runtime/pkg/predicate"

0 commit comments

Comments
 (0)