Skip to content

Commit

Permalink
chore: rename operator folder to lifecycle-operator (#1819)
Browse files Browse the repository at this point in the history
Co-authored-by: Florian Bacher <[email protected]>
  • Loading branch information
mowies and bacherfl authored Aug 3, 2023
1 parent 650ecba commit 97a2d25
Show file tree
Hide file tree
Showing 396 changed files with 583 additions and 660 deletions.
4 changes: 2 additions & 2 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ documentation:
- docs/**/*
- "**/*.md"

operator:
- operator/**/*
lifecycle-operator:
- lifecycle-operator/**/*

scheduler:
- scheduler/**/*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
processor:
useRawDocstring: true
ignoreTypes:
- "nomatch" # this needs to be in place as a workaround to avoid generation bugs
- "EmptyStatus$"
ignoreFields:
- "TypeMeta$"
- "EmptyStatus$"
Expand Down
4 changes: 2 additions & 2 deletions .github/scripts/generate-crd-docs/generate-crd-docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

# CRD docs auto generation script
#
# This script goes through all API definitions in the operator/apis folder
# This script goes through all API definitions in the lifecycle-operator/apis folder
# and generates docs from code for each API group and version
#
# Inputs: None

# renovate: datasource=github-releases depName=elastic/crd-ref-docs
GENERATOR_VERSION=master
API_DOMAIN="keptn.sh"
OPERATOR_API_ROOT='operator/apis/'
OPERATOR_API_ROOT='lifecycle-operator/apis/'
METRICS_API_ROOT='metrics-operator/api/'
TEMPLATE_DIR='.github/scripts/generate-crd-docs/templates'
RENDERER='markdown'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/CI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
matrix:
config:
- name: "lifecycle-operator"
folder: "operator/"
folder: "lifecycle-operator/"
- name: "metrics-operator"
folder: "metrics-operator/"
- name: "scheduler"
Expand Down Expand Up @@ -119,7 +119,7 @@ jobs:
matrix:
config:
- name: "lifecycle-operator"
folder: "operator/"
folder: "lifecycle-operator/"
- name: "metrics-operator"
folder: "metrics-operator/"
- name: "scheduler"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/component-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ jobs:
with:
go-version: ${{ env.GO_VERSION }}
cache: true
cache-dependency-path: 'operator/go.sum'
cache-dependency-path: 'lifecycle-operator/go.sum'
check-latest: true

- name: Execute Component Tests
working-directory: operator
working-directory: lifecycle-operator
run: make component-test

- name: Report code coverage
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
matrix:
config:
- name: "lifecycle-operator"
folder: "operator/"
folder: "lifecycle-operator/"
- name: "scheduler"
folder: "scheduler/"
steps:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
matrix:
config:
- name: "lifecycle-operator"
folder: "operator/"
folder: "lifecycle-operator/"
- name: "metrics-operator"
folder: "metrics-operator/"
- name: "scheduler"
Expand All @@ -43,6 +43,8 @@ jobs:
with:
go-version: ${{ env.GO_VERSION }}
check-latest: true
cache: true
cache-dependency-path: '${{ matrix.config.folder }}go.sum'

- name: golangci-lint
uses: golangci/golangci-lint-action@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/helm-checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
matrix:
config:
- name: "lifecycle-operator"
folder: "operator/"
folder: "lifecycle-operator/"
- name: "metrics-operator"
folder: "metrics-operator/"
- name: "scheduler"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/htmltest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
with:
path: |
docs/tmp/.hugo
key: ${{ runner.os }}-hugo
key: ${{ runner.os }}-hugo-${{ hashFiles('docs/go.sum') }}

- name: Check HTML
run: make htmltest
7 changes: 4 additions & 3 deletions .github/workflows/markdown-checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ on:
- '[0-9]+.[1-9][0-9]*.x'
paths:
- '**.md'
- 'operator/apis'
- 'metrics-operator/api'
- 'lifecycle-operator/apis/**'
- 'metrics-operator/api/**'
pull_request:
branches:
- 'main'
- '[0-9]+.[1-9][0-9]*.x'
paths:
- '**.md'
- 'operator/apis/**'
- 'lifecycle-operator/apis/**'
- 'metrics-operator/api/**'

env:
Expand Down Expand Up @@ -76,6 +76,7 @@ jobs:
with:
go-version: ${{ env.GO_VERSION }}
check-latest: true
cache: false

- name: Copy old docs
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/performance-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
runtime_tag: ${{ inputs.runtime_tag }}

- name: Execute Performance Tests
working-directory: operator
working-directory: lifecycle-operator
run: |
make performance-test
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
const kltMatrix = [
{
name: "lifecycle-operator",
folder: "operator/",
folder: "lifecycle-operator/",
tagName: KLT_TAG
},
{
Expand Down Expand Up @@ -199,12 +199,12 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

- name: Cache build tools operator
- name: Cache build tools lifecycle-operator
if: needs.release-please.outputs.klt-release-created == 'true'
id: cache-build-tools-operator
id: cache-build-tools-lifecycle-operator
uses: actions/cache@v3
with:
path: ./operator/bin
path: ./lifecycle-operator/bin
key: build-tools-${{ github.ref_name }}

- name: Cache build tools metrics-operator
Expand Down Expand Up @@ -245,14 +245,14 @@ jobs:
run: |
cd scheduler
make release-manifests
cd ../operator
cd ../lifecycle-operator
make controller-gen release-manifests
cd ../klt-cert-manager
make controller-gen release-manifests
cd ../metrics-operator
make controller-gen release-manifests
cd ..
echo "---" >> operator/config/rendered/release.yaml
echo "---" >> lifecycle-operator/config/rendered/release.yaml
echo "---" >> scheduler/config/rendered/release.yaml
echo "---" >> klt-cert-manager/config/rendered/release.yaml
cat >> namespace.yaml << EOF
Expand All @@ -264,7 +264,7 @@ jobs:
---
EOF
cat namespace.yaml \
operator/config/rendered/release.yaml \
lifecycle-operator/config/rendered/release.yaml \
scheduler/config/rendered/release.yaml \
klt-cert-manager/config/rendered/release.yaml \
metrics-operator/config/rendered/release.yaml > klt-manifest.yaml
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/security-scans.yml
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ jobs:
go install github.com/yannh/kubeconform/cmd/kubeconform@${{ matrix.version }}
echo "::endgroup::"
cd operator/config/default
sed -i 's/\- ..\/crd//' kustomization.yaml && kustomize build ./ > /tmp/operator-manifest.yaml
cd lifecycle-operator/config/default
sed -i 's/\- ..\/crd//' kustomization.yaml && kustomize build ./ > /tmp/lifecycle-operator-manifest.yaml
cd ../crd && kustomize build ./ > /tmp/crds.yaml
cd ../../../metrics-operator/config/default
sed -i 's/\- ..\/crd//' kustomization.yaml && kustomize build ./ > /tmp/metrics-operator-manifest.yaml
Expand All @@ -159,9 +159,9 @@ jobs:
mkdir -p /tmp/schema && cd /tmp/schema
python3 ../openapi2jsonschema.py ../crds.yaml
cd .. && \
echo "---" >> operator-manifest.yaml && \
echo "---" >> lifecycle-operator-manifest.yaml && \
echo "---" >> scheduler-manifest.yaml && \
cat operator-manifest.yaml scheduler-manifest.yaml metrics-operator-manifest.yaml > manifest.yaml
cat lifecycle-operator-manifest.yaml scheduler-manifest.yaml metrics-operator-manifest.yaml > manifest.yaml
kubeconform \
-schema-location default \
-schema-location './schema/{{ .ResourceKind }}_{{ .ResourceAPIVersion }}.json' \
Expand Down Expand Up @@ -221,7 +221,7 @@ jobs:
fail-fast: false
matrix:
artifact:
- "operator"
- "lifecycle-operator"
- "metrics-operator"
- "scheduler"
- "klt-cert-manager"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/validate-semantic-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
scopes: |
helm-chart
scheduler
operator
lifecycle-operator
cert-manager
metrics-operator
functions-runtime
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ kubeconfig

manifests/
/scheduler/config/rendered/release.yaml
/operator/config/rendered/release.yaml
/lifecycle-operator/config/rendered/release.yaml
/metrics-operator/config/rendered/release.yaml
/klt-cert-manager/config/rendered/release.yaml
# macOS
Expand Down
4 changes: 2 additions & 2 deletions .yamllint
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ ignore: |
**/rendered/release.yaml
examples/support/observability/config/prometheus
dashboards/grafana
operator/config/crd/bases/*
lifecycle-operator/config/crd/bases/*
metrics-operator/config/crd/bases/*
klt-cert-manager/config/crd/bases/*
operator/config/rbac/role.yaml
lifecycle-operator/config/rbac/role.yaml
metrics-operator/config/rbac/role.yaml
klt-cert-manager/config/rbac/role.yaml
helm/chart/templates
Expand Down
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -85,22 +85,22 @@ helm-package:

.PHONY: build-release-manifests
build-release-manifests:
$(MAKE) -C operator generate
$(MAKE) -C lifecycle-operator generate
$(MAKE) -C klt-cert-manager generate
$(MAKE) -C metrics-operator generate

$(MAKE) -C operator release-manifests RELEASE_REGISTRY=$(RELEASE_REGISTRY) TAG=$(TAG) ARCH=$(ARCH) CHART_APPVERSION=$(CHART_APPVERSION)
$(MAKE) -C lifecycle-operator release-manifests RELEASE_REGISTRY=$(RELEASE_REGISTRY) TAG=$(TAG) ARCH=$(ARCH) CHART_APPVERSION=$(CHART_APPVERSION)
$(MAKE) -C scheduler release-manifests RELEASE_REGISTRY=$(RELEASE_REGISTRY) TAG=$(TAG) ARCH=$(ARCH) CHART_APPVERSION=$(CHART_APPVERSION)
$(MAKE) -C klt-cert-manager release-manifests RELEASE_REGISTRY=$(RELEASE_REGISTRY) TAG=$(TAG) ARCH=$(ARCH) CHART_APPVERSION=$(CHART_APPVERSION)
$(MAKE) -C metrics-operator release-manifests RELEASE_REGISTRY=$(RELEASE_REGISTRY) TAG=$(TAG) ARCH=$(ARCH) CHART_APPVERSION=$(CHART_APPVERSION)

.PHONY: build-deploy-operator
build-deploy-operator:
$(MAKE) -C operator release-local.$(ARCH) RELEASE_REGISTRY=$(RELEASE_REGISTRY) TAG=$(TAG)
$(MAKE) -C operator push-local RELEASE_REGISTRY=$(RELEASE_REGISTRY) TAG=$(TAG)
$(MAKE) -C operator release-manifests RELEASE_REGISTRY=$(RELEASE_REGISTRY) CHART_APPVERSION=$(TAG) ARCH=$(ARCH)
$(MAKE) -C lifecycle-operator release-local.$(ARCH) RELEASE_REGISTRY=$(RELEASE_REGISTRY) TAG=$(TAG)
$(MAKE) -C lifecycle-operator push-local RELEASE_REGISTRY=$(RELEASE_REGISTRY) TAG=$(TAG)
$(MAKE) -C lifecycle-operator release-manifests RELEASE_REGISTRY=$(RELEASE_REGISTRY) CHART_APPVERSION=$(TAG) ARCH=$(ARCH)

kubectl apply -f operator/config/rendered/release.yaml
kubectl apply -f lifecycle-operator/config/rendered/release.yaml

.PHONY: build-deploy-metrics-operator
build-deploy-metrics-operator:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@ The [GitHub CLI](https://cli.github.com/) can be used to download the manifests
```bash
gh run list --repo keptn/lifecycle-toolkit # find the id of a run
gh run download 3152895000 --repo keptn/lifecycle-toolkit # download the artifacts
kubectl apply -f ./keptn-lifecycle-operator-manifest/release.yaml # install the operator
kubectl apply -f ./keptn-lifecycle-operator-manifest/release.yaml # install the lifecycle-operator
kubectl apply -f ./scheduler-manifest/release.yaml # install the scheduler
```

Expand Down
4 changes: 2 additions & 2 deletions codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ github_checks:
flags:
keptn-lifecycle-operator:
paths:
- operator/
- lifecycle-operator/
carryforward: true
scheduler:
paths:
- scheduler/
carryforward: true
component-tests:
paths:
- operator/
- lifecycle-operator/
carryforward: true
1 change: 0 additions & 1 deletion docs/.htmltest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ CheckDoctype: false
IgnoreDirectoryMissingTrailingSlash: true
IgnoreDirs:
- favicons
- docs/crd-ref/lifecycle/
- community/
IgnoreURLs:
- "linkedin.com"
Expand Down
4 changes: 2 additions & 2 deletions docs/content/en/docs/crd-ref/lifecycle/v1alpha1/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ _Appears in:_
| `kind` _string_ | `KeptnEvaluationDefinition`
| `metadata` _[ObjectMeta](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#objectmeta-v1-meta)_ | Refer to Kubernetes API documentation for fields of `metadata`. |
| `spec` _[KeptnEvaluationDefinitionSpec](#keptnevaluationdefinitionspec)_ | |
| `status` _[EmptyStatus](#emptystatus)_ | unused field |
| `status` _string_ | unused field |


#### KeptnEvaluationDefinitionList
Expand Down Expand Up @@ -410,7 +410,7 @@ _Appears in:_
| `kind` _string_ | `KeptnEvaluationProvider`
| `metadata` _[ObjectMeta](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#objectmeta-v1-meta)_ | Refer to Kubernetes API documentation for fields of `metadata`. |
| `spec` _[KeptnEvaluationProviderSpec](#keptnevaluationproviderspec)_ | |
| `status` _[EmptyStatus](#emptystatus)_ | unused field |
| `status` _string_ | unused field |


#### KeptnEvaluationProviderList
Expand Down
4 changes: 2 additions & 2 deletions docs/content/en/docs/crd-ref/lifecycle/v1alpha2/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ _Appears in:_
| `kind` _string_ | `KeptnEvaluationDefinition`
| `metadata` _[ObjectMeta](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#objectmeta-v1-meta)_ | Refer to Kubernetes API documentation for fields of `metadata`. |
| `spec` _[KeptnEvaluationDefinitionSpec](#keptnevaluationdefinitionspec)_ | |
| `status` _[EmptyStatus](#emptystatus)_ | unused field |
| `status` _string_ | unused field |


#### KeptnEvaluationDefinitionList
Expand Down Expand Up @@ -412,7 +412,7 @@ _Appears in:_
| `kind` _string_ | `KeptnEvaluationProvider`
| `metadata` _[ObjectMeta](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#objectmeta-v1-meta)_ | Refer to Kubernetes API documentation for fields of `metadata`. |
| `spec` _[KeptnEvaluationProviderSpec](#keptnevaluationproviderspec)_ | |
| `status` _[EmptyStatus](#emptystatus)_ | unused field |
| `status` _string_ | unused field |


#### KeptnEvaluationProviderList
Expand Down
6 changes: 3 additions & 3 deletions docs/content/en/docs/crd-ref/lifecycle/v1alpha3/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ _Appears in:_
| `kind` _string_ | `KeptnAppCreationRequest`
| `metadata` _[ObjectMeta](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#objectmeta-v1-meta)_ | Refer to Kubernetes API documentation for fields of `metadata`. |
| `spec` _[KeptnAppCreationRequestSpec](#keptnappcreationrequestspec)_ | Spec describes the desired state of the KeptnAppCreationRequest. |
| `status` _[EmptyStatus](#emptystatus)_ | Status describes the current state of the KeptnAppCreationRequest. |
| `status` _string_ | Status describes the current state of the KeptnAppCreationRequest. |


#### KeptnAppCreationRequestList
Expand Down Expand Up @@ -411,7 +411,7 @@ _Appears in:_
| `kind` _string_ | `KeptnEvaluationDefinition`
| `metadata` _[ObjectMeta](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#objectmeta-v1-meta)_ | Refer to Kubernetes API documentation for fields of `metadata`. |
| `spec` _[KeptnEvaluationDefinitionSpec](#keptnevaluationdefinitionspec)_ | Spec describes the desired state of the KeptnEvaluationDefinition. |
| `status` _[EmptyStatus](#emptystatus)_ | unused field |
| `status` _string_ | unused field |


#### KeptnEvaluationDefinitionList
Expand Down Expand Up @@ -475,7 +475,7 @@ _Appears in:_
| `kind` _string_ | `KeptnEvaluationProvider`
| `metadata` _[ObjectMeta](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#objectmeta-v1-meta)_ | Refer to Kubernetes API documentation for fields of `metadata`. |
| `spec` _[KeptnEvaluationProviderSpec](#keptnevaluationproviderspec)_ | |
| `status` _[EmptyStatus](#emptystatus)_ | unused field |
| `status` _string_ | unused field |


#### KeptnEvaluationProviderList
Expand Down
Loading

0 comments on commit 97a2d25

Please sign in to comment.