diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml index c976f7924e3..da0d7c6001a 100644 --- a/.github/workflows/CI.yaml +++ b/.github/workflows/CI.yaml @@ -19,8 +19,8 @@ env: SHOULD_RUN_FUNCTIONS_RUNTIME_SVC: "false" LFC_SCHEDULER_SVC_ARTIFACT_PREFIX: "LFC_SCHEDULER_SVC" - LFC_SCHEDULER_SVC_ARTIFACT: "lfc-scheduler" - LFC_SCHEDULER_SVC_FOLDER: "lfc-scheduler/" + LFC_SCHEDULER_SVC_ARTIFACT: "scheduler" + LFC_SCHEDULER_SVC_FOLDER: "scheduler/" OPERATOR_SVC_ARTIFACT_PREFIX: "OPERATOR_SVC" OPERATOR_SVC_ARTIFACT: "keptn-lifecycle-operator" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fc6fb1e30b4..4e3eaf3b2b7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -46,7 +46,7 @@ jobs: run: | cd functions-runtime make build-and-push-image TAG=${{ needs.release-please.outputs.tag_name }} - cd ../lfc-scheduler + cd ../scheduler go mod tidy make build-and-push-image TAG=${{ needs.release-please.outputs.tag_name }} make release-manifests TAG=${{ needs.release-please.outputs.tag_name }} @@ -55,7 +55,7 @@ jobs: make build-and-push-image TAG=${{ needs.release-please.outputs.tag_name }} make controller-gen release-manifests TAG=${{ needs.release-please.outputs.tag_name }} cd .. - cat lfc-scheduler/config/rendered/release.yaml operator/config/rendered/release.yaml > manifest.yaml + cat scheduler/config/rendered/release.yaml operator/config/rendered/release.yaml > manifest.yaml - name: Attach release assets uses: softprops/action-gh-release@v1 diff --git a/README.md b/README.md index 121ef9d59bc..f01f28da2bf 100644 --- a/README.md +++ b/README.md @@ -262,7 +262,7 @@ The [GitHub CLI](https://cli.github.com/) can be used to download the manifests gh run list --repo keptn-sandbox/lifecycle-controller # find the id of a run gh run download 3152895000 --repo keptn-sandbox/lifecycle-controller # download the artifacts kubectl apply -f ./keptn-lifecycle-operator-manifest/release.yaml # install the operator -kubectl apply -f ./lfc-scheduler-manifest/release.yaml # install the scheduler +kubectl apply -f ./scheduler-manifest/release.yaml # install the scheduler ``` Instead, if you want to build and deploy the operator into your cluster directly from the code, you can type: diff --git a/lfc-scheduler/.dockerignore b/scheduler/.dockerignore similarity index 100% rename from lfc-scheduler/.dockerignore rename to scheduler/.dockerignore diff --git a/lfc-scheduler/.gitignore b/scheduler/.gitignore similarity index 100% rename from lfc-scheduler/.gitignore rename to scheduler/.gitignore diff --git a/lfc-scheduler/Dockerfile b/scheduler/Dockerfile similarity index 92% rename from lfc-scheduler/Dockerfile rename to scheduler/Dockerfile index d10a41c149b..c5e2c3797cc 100644 --- a/lfc-scheduler/Dockerfile +++ b/scheduler/Dockerfile @@ -16,7 +16,7 @@ FROM golang:1.18.0 as builder ARG ARCH ARG RELEASE_VERSION -WORKDIR /lfc-scheduler +WORKDIR /scheduler COPY go.mod go.sum Makefile ./ @@ -35,7 +35,7 @@ LABEL org.opencontainers.image.source="https://github.com/keptn-sandbox/lifecycl org.opencontainers.image.vendor="Keptn" \ org.opencontainers.image.licenses="Apache-2.0" -COPY --from=builder /lfc-scheduler/bin/kube-scheduler /bin/kube-scheduler +COPY --from=builder /scheduler/bin/kube-scheduler /bin/kube-scheduler USER 65532:65532 WORKDIR /bin diff --git a/lfc-scheduler/Makefile b/scheduler/Makefile similarity index 99% rename from lfc-scheduler/Makefile rename to scheduler/Makefile index 7427e511a35..7c2a6ef9d2f 100644 --- a/lfc-scheduler/Makefile +++ b/scheduler/Makefile @@ -25,7 +25,7 @@ LOCAL_CONTROLLER_IMAGE=controller:latest # into. RELEASE_REGISTRY?=ghcr.io/keptn-sandbox RELEASE_VERSION?=$(shell date +%Y%m%d%s)-v0.24.3#$(shell git describe --tags --match "v*") -RELEASE_IMAGE:=lfc-scheduler:$(TAG) +RELEASE_IMAGE:=scheduler:$(TAG) RELEASE_CONTROLLER_IMAGE:=controller:$(RELEASE_VERSION) # VERSION is the scheduler's version diff --git a/lfc-scheduler/README.md b/scheduler/README.md similarity index 100% rename from lfc-scheduler/README.md rename to scheduler/README.md diff --git a/lfc-scheduler/cmd/scheduler/main.go b/scheduler/cmd/scheduler/main.go similarity index 92% rename from lfc-scheduler/cmd/scheduler/main.go rename to scheduler/cmd/scheduler/main.go index 3b0b8b8c5f8..700bae1f8be 100644 --- a/lfc-scheduler/cmd/scheduler/main.go +++ b/scheduler/cmd/scheduler/main.go @@ -17,7 +17,7 @@ limitations under the License. package main import ( - "github.com/keptn-sandbox/lifecycle-controller/lfc-scheduler/pkg/klcpermit" + "github.com/keptn-sandbox/lifecycle-controller/scheduler/pkg/klcpermit" "k8s.io/apimachinery/pkg/util/rand" "k8s.io/component-base/cli" "k8s.io/kubernetes/cmd/kube-scheduler/app" diff --git a/lfc-scheduler/cmd/scheduler/main_test.go b/scheduler/cmd/scheduler/main_test.go similarity index 100% rename from lfc-scheduler/cmd/scheduler/main_test.go rename to scheduler/cmd/scheduler/main_test.go diff --git a/lfc-scheduler/config/rbac/auth_proxy_client_clusterrole.yaml b/scheduler/config/rbac/auth_proxy_client_clusterrole.yaml similarity index 100% rename from lfc-scheduler/config/rbac/auth_proxy_client_clusterrole.yaml rename to scheduler/config/rbac/auth_proxy_client_clusterrole.yaml diff --git a/lfc-scheduler/config/rbac/auth_proxy_role.yaml b/scheduler/config/rbac/auth_proxy_role.yaml similarity index 100% rename from lfc-scheduler/config/rbac/auth_proxy_role.yaml rename to scheduler/config/rbac/auth_proxy_role.yaml diff --git a/lfc-scheduler/config/rbac/auth_proxy_role_binding.yaml b/scheduler/config/rbac/auth_proxy_role_binding.yaml similarity index 100% rename from lfc-scheduler/config/rbac/auth_proxy_role_binding.yaml rename to scheduler/config/rbac/auth_proxy_role_binding.yaml diff --git a/lfc-scheduler/config/rbac/kustomization.yaml b/scheduler/config/rbac/kustomization.yaml similarity index 100% rename from lfc-scheduler/config/rbac/kustomization.yaml rename to scheduler/config/rbac/kustomization.yaml diff --git a/lfc-scheduler/config/rbac/leader_election_role.yaml b/scheduler/config/rbac/leader_election_role.yaml similarity index 100% rename from lfc-scheduler/config/rbac/leader_election_role.yaml rename to scheduler/config/rbac/leader_election_role.yaml diff --git a/lfc-scheduler/config/rbac/leader_election_role_binding.yaml b/scheduler/config/rbac/leader_election_role_binding.yaml similarity index 100% rename from lfc-scheduler/config/rbac/leader_election_role_binding.yaml rename to scheduler/config/rbac/leader_election_role_binding.yaml diff --git a/lfc-scheduler/config/rbac/role.yaml b/scheduler/config/rbac/role.yaml similarity index 100% rename from lfc-scheduler/config/rbac/role.yaml rename to scheduler/config/rbac/role.yaml diff --git a/lfc-scheduler/config/rendered/.gitkeep b/scheduler/config/rendered/.gitkeep similarity index 100% rename from lfc-scheduler/config/rendered/.gitkeep rename to scheduler/config/rendered/.gitkeep diff --git a/lfc-scheduler/go.mod b/scheduler/go.mod similarity index 97% rename from lfc-scheduler/go.mod rename to scheduler/go.mod index 69da079c7d6..69253b63984 100644 --- a/lfc-scheduler/go.mod +++ b/scheduler/go.mod @@ -1,4 +1,4 @@ -module github.com/keptn-sandbox/lifecycle-controller/lfc-scheduler +module github.com/keptn-sandbox/lifecycle-controller/scheduler go 1.18 @@ -111,7 +111,7 @@ require ( ) replace ( - github.com/keptn-sandbox/lifecycle-controller/lfc-scheduler/pkg/klcpermit => /pkg/klcpermit + github.com/keptn-sandbox/lifecycle-controller/scheduler/pkg/klcpermit => /pkg/klcpermit k8s.io/api => k8s.io/api v0.24.3 k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.3 k8s.io/apimachinery => k8s.io/apimachinery v0.24.3 diff --git a/lfc-scheduler/go.sum b/scheduler/go.sum similarity index 100% rename from lfc-scheduler/go.sum rename to scheduler/go.sum diff --git a/lfc-scheduler/manifests/install/base/deployment.yaml b/scheduler/manifests/install/base/deployment.yaml similarity index 100% rename from lfc-scheduler/manifests/install/base/deployment.yaml rename to scheduler/manifests/install/base/deployment.yaml diff --git a/lfc-scheduler/manifests/install/base/rbac.yaml b/scheduler/manifests/install/base/rbac.yaml similarity index 100% rename from lfc-scheduler/manifests/install/base/rbac.yaml rename to scheduler/manifests/install/base/rbac.yaml diff --git a/lfc-scheduler/manifests/install/base/scheduler-config.yaml b/scheduler/manifests/install/base/scheduler-config.yaml similarity index 100% rename from lfc-scheduler/manifests/install/base/scheduler-config.yaml rename to scheduler/manifests/install/base/scheduler-config.yaml diff --git a/lfc-scheduler/manifests/install/base/serviceaccount.yaml b/scheduler/manifests/install/base/serviceaccount.yaml similarity index 100% rename from lfc-scheduler/manifests/install/base/serviceaccount.yaml rename to scheduler/manifests/install/base/serviceaccount.yaml diff --git a/lfc-scheduler/manifests/install/charts/keptn-scheduler/values.yaml b/scheduler/manifests/install/charts/keptn-scheduler/values.yaml similarity index 100% rename from lfc-scheduler/manifests/install/charts/keptn-scheduler/values.yaml rename to scheduler/manifests/install/charts/keptn-scheduler/values.yaml diff --git a/lfc-scheduler/manifests/install/kustomization.yaml b/scheduler/manifests/install/kustomization.yaml similarity index 88% rename from lfc-scheduler/manifests/install/kustomization.yaml rename to scheduler/manifests/install/kustomization.yaml index c1737fd324a..01c54e5f357 100644 --- a/lfc-scheduler/manifests/install/kustomization.yaml +++ b/scheduler/manifests/install/kustomization.yaml @@ -17,5 +17,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization images: - name: klfc-scheduler - newName: ghcr.io/keptn-sandbox/lfc-scheduler + newName: ghcr.io/keptn-sandbox/scheduler newTag: latest diff --git a/lfc-scheduler/manifests/permit/scheduler-config.yaml b/scheduler/manifests/permit/scheduler-config.yaml similarity index 100% rename from lfc-scheduler/manifests/permit/scheduler-config.yaml rename to scheduler/manifests/permit/scheduler-config.yaml diff --git a/lfc-scheduler/pkg/klcpermit/permit.go b/scheduler/pkg/klcpermit/permit.go similarity index 100% rename from lfc-scheduler/pkg/klcpermit/permit.go rename to scheduler/pkg/klcpermit/permit.go diff --git a/lfc-scheduler/pkg/klcpermit/workflow_manager.go b/scheduler/pkg/klcpermit/workflow_manager.go similarity index 100% rename from lfc-scheduler/pkg/klcpermit/workflow_manager.go rename to scheduler/pkg/klcpermit/workflow_manager.go