Delete serverless and runtime from components

.github/dependabot.yml

@@ -36,102 +36,3 @@ updates:
       prefix: "operator"
       include: "scope"
 
-  - package-ecosystem: "docker"
-    directory: "/components/serverless/deploy/jobinit"
-    labels:
-      - "area/dependency"
-      - "kind/chore"
-    schedule:
-      interval: "weekly"
-    commit-message:
-      prefix: "jobinit"
-      include: "scope"
-  - package-ecosystem: "docker"
-    directory: "/components/serverless/deploy/manager"
-    labels:
-      - "area/dependency"
-      - "kind/chore"
-    schedule:
-      interval: "weekly"
-    commit-message:
-      prefix: "manager"
-      include: "scope"
-
-  - package-ecosystem: "docker"
-    directory: "/tests/gitserver"
-    labels:
-      - "area/dependency"
-      - "kind/chore"
-    schedule:
-      interval: "weekly"
-    commit-message:
-      prefix: "gitserver"
-      include: "scope"
-
-  - package-ecosystem: "pip"
-    directory: "/components/runtimes/python/python39"
-    labels:
-      - "area/dependency"
-      - "kind/chore"
-    schedule:
-      interval: "weekly"
-    commit-message:
-      prefix: "pip-python39"
-      include: "scope"
-    groups:
-      opentelemetry:
-        patterns:
-          - "opentelemetry-*"
-  - package-ecosystem: "pip"
-    directory: "/components/runtimes/python/python312"
-    labels:
-      - "area/dependency"
-      - "kind/chore"
-    schedule:
-      interval: "weekly"
-    commit-message:
-      prefix: "pip-python312"
-      include: "scope"
-    groups:
-      opentelemetry:
-        patterns:
-          - "opentelemetry-*"
-
-  - package-ecosystem: "npm"
-    directory: "/components/runtimes/nodejs/nodejs18"
-    labels:
-      - "area/dependency"
-      - "kind/chore"
-    schedule:
-      interval: "weekly"
-    commit-message:
-      prefix: "npm-nodejs18"
-      include: "scope"
-    groups:
-      opentelemetry:
-        patterns:
-          - "@opentelemetry/*"
-  - package-ecosystem: "npm"
-    directory: "/components/runtimes/nodejs/nodejs20"
-    labels:
-      - "area/dependency"
-      - "kind/chore"
-    schedule:
-      interval: "weekly"
-    commit-message:
-      prefix: "npm-nodejs20"
-      include: "scope"
-    groups:
-      opentelemetry:
-        patterns:
-          - "@opentelemetry/*"
-  - package-ecosystem: "npm"
-    directory: "/tests/gitserver/repos/function"
-    labels:
-      - "area/dependency"
-      - "kind/chore"
-    schedule:
-      interval: "weekly"
-    commit-message:
-      prefix: "npm-test"
-      include: "scope"

.github/scripts/release.sh

@@ -34,8 +34,8 @@ uploadFile() {
 echo "IMG: ${IMG}"
 IMG=${IMG} make -C components/operator/ render-manifest
 
-echo "Generated serverless-operator.yaml:"
-cat serverless-operator.yaml
+echo "Generated dockerregistry-operator.yaml:"
+cat dockerregistry-operator.yaml
 
 echo "Fetching releases"
 CURL_RESPONSE=$(curl -w "%{http_code}" -sL \
@@ -62,9 +62,9 @@ fi
 echo "Updating github release with assets"
 UPLOAD_URL="https://uploads.github.com/repos/kyma-project/serverless/releases/${RELEASE_ID}/assets"
 
-uploadFile "serverless-operator.yaml" "${UPLOAD_URL}?name=serverless-operator.yaml"
-uploadFile "config/samples/default-serverless-cr.yaml" "${UPLOAD_URL}?name=default-serverless-cr.yaml"
-uploadFile "config/samples/default-serverless-cr-k3d.yaml" "${UPLOAD_URL}?name=default-serverless-cr-k3d.yaml"
+uploadFile "dockerregistry-operator.yaml" "${UPLOAD_URL}?name=dockerregistry-operator.yaml"
+uploadFile "config/samples/default-dockerregistry-cr.yaml" "${UPLOAD_URL}?name=default-dockerregistry-cr.yaml"
+uploadFile "config/samples/default-dockerregistry-cr-k3d.yaml" "${UPLOAD_URL}?name=default-dockerregistry-cr-k3d.yaml"
 
 
 

.github/scripts/upgrade-sec-scanners-config.sh

@@ -8,8 +8,8 @@ yq eval-all --inplace '
         | .global.containerRegistry.path as $registryPath
         | (
             {
-                "serverless_operator" : {
-                    "name" : "serverless-operator",
+                "dockerregistry_operator" : {
+                    "name" : "dockerregistry-operator",
                     "directory" : "prod",
                     "version" : env(IMG_VERSION)
                 }
@@ -19,4 +19,4 @@ yq eval-all --inplace '
         | $registryPath + "/" + .directory + "/" + .name + ":" + .version
     ]
     | select(fileIndex == 0)
-    ' sec-scanners-config.yaml config/serverless/values.yaml
+    ' sec-scanners-config.yaml config/docker-registry/values.yaml

.github/workflows/create-release.yaml

@@ -41,14 +41,6 @@ jobs:
           token: ${{ secrets.BOT_TOKEN }}
           fetch-depth: 0
 
-      - name: Bump values.yaml
-        run: |
-          ./hack/replace_serverless_chart_images.sh all .
-        env:
-          IMG_DIRECTORY: "prod"
-          IMG_VERSION: ${{ github.event.inputs.name }}
-          PROJECT_ROOT: "."
-
       - name: Bump sec-scanners-config.yaml based on values.yaml
         run: ./.github/scripts/upgrade-sec-scanners-config.sh
         env:

.github/workflows/images-verify.yaml

@@ -6,7 +6,7 @@ on:
       - main
     paths: 
       - sec-scanners-config.yaml
-      - config/serverless/values.yaml
+      - config/docker-registry/values.yaml
 
 jobs:
   # check if developer doesn't change `main` images in the values.yaml and sec-scanners-config.yaml files
@@ -24,7 +24,7 @@ jobs:
           echo SSC_MAIN_IMAGES=$(yq '.protecode[] | select(contains(":main")) | sub(":.*", "")' sec-scanners-config.yaml) >> $GITHUB_ENV
 
           # export values. images with the main tag as github env
-          echo VALUES_MAIN_IMAGES=$(yq '.global.images[] | select(.version == "main") | .name' config/serverless/values.yaml) >> $GITHUB_ENV
+          echo VALUES_MAIN_IMAGES=$(yq '.global.images[] | select(.version == "main") | .name' config/docker-registry/values.yaml) >> $GITHUB_ENV
 
       - name: Checkout to context
         uses: actions/checkout@v4
@@ -38,7 +38,7 @@ jobs:
 
       - name: Verify values.yaml images
         run: |
-          PR_NOT_MAIN_IMAGES=$(yq '.global.images[] | select(.version != "main") | .name' config/serverless/values.yaml) \
+          PR_NOT_MAIN_IMAGES=$(yq '.global.images[] | select(.version != "main") | .name' config/docker-registry/values.yaml) \
             .github/scripts/verify-image-changes.sh
         env:
           MAIN_IMAGES: ${{ env.VALUES_MAIN_IMAGES }}

.github/workflows/serverless-verify.yaml

@@ -15,28 +15,6 @@ on:
       - converted_to_draft
 
 jobs:
-  #pre-serverless-controller-lint
-  lint:
-    if: github.event_name == 'pull_request'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/setup-libgit2
-      - uses: golangci/golangci-lint-action@v3
-        with:
-          version: latest
-          working-directory: 'components/serverless'
-
-  #pre-serverless-controller-unit-test
-  unit-test:
-    if: github.event_name == 'pull_request'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/setup-libgit2
-      - name: run test
-        run: make -C components/serverless test
-
   integration-test:
     runs-on: ubuntu-latest
     if: github.event.pull_request.draft == false

.gitignore

@@ -44,5 +44,7 @@ manifests/serverless/rendered.yaml
 serverless.yaml
 moduletemplate-latest.yaml
 module-config.yaml
+dockerregistry-operator.yaml
+dockerregistry.yaml
 
 examples/python-text2img/resources/secrets/deepai.env

CODEOWNERS

@@ -1,4 +1,4 @@
-# These are the default owners for the whole content of the `serverless-manager` repository. The default owners are automatically added as reviewers when you open a pull request unless different owners are specified in the file.
+# These are the default owners for the whole content of the `dockerregistry` repository. The default owners are automatically added as reviewers when you open a pull request unless different owners are specified in the file.
 * @m00g3n @pPrecel @dbadura @kwiatekus @cortey @anoipm @MichalKalke
 
 # All files and subdirectories in /docs

Makefile

@@ -4,28 +4,28 @@ include ${PROJECT_ROOT}/hack/help.mk
 include ${PROJECT_ROOT}/hack/k3d.mk
 
 ##@ Installation
-.PHONY: install-serverless-main
-install-serverless-main: ## Install serverless with operator using default serverless cr
-	make -C ${OPERATOR_ROOT} deploy-main apply-default-serverless-cr check-serverless-installation
+.PHONY: install-dockerregistry-main
+install-dockerregistry-main: ## Install dockerregistry with operator using default dockerregistry cr
+	make -C ${OPERATOR_ROOT} deploy-main apply-default-dockerregistry-cr check-dockerregistry-installation
 
-.PHONY: install-serverless-custom-operator
-install-serverless-custom-operator: ## Install serverless with operator from IMG env using default serverless cr
+.PHONY: install-dockerregistry-custom-operator
+install-dockerregistry-custom-operator: ## Install dockerregistry with operator from IMG env using default dockerregistry cr
 	$(call check-var,IMG)
-	make -C ${OPERATOR_ROOT} deploy apply-default-serverless-cr check-serverless-installation
+	make -C ${OPERATOR_ROOT} deploy apply-default-dockerregistry-cr check-dockerregistry-installation
 
-.PHONY: install-serverless-latest-release
-install-serverless-latest-release: ## Install serverless from latest release
+.PHONY: install-dockerregistry-latest-release
+install-dockerregistry-latest-release: ## Install dockerregistry from latest release
 	kubectl create namespace kyma-system || true
-	kubectl apply -f https://github.com/kyma-project/serverless-manager/releases/latest/download/serverless-operator.yaml
-	kubectl apply -f https://github.com/kyma-project/serverless-manager/releases/latest/download/default-serverless-cr.yaml -n kyma-system
-	make -C ${OPERATOR_ROOT} check-serverless-installation
+	kubectl apply -f https://github.com/kyma-project/serverless-manager/releases/latest/download/dockerregistry-operator.yaml
+	kubectl apply -f https://github.com/kyma-project/serverless-manager/releases/latest/download/default-dockerregistry-cr.yaml -n kyma-system
+	make -C ${OPERATOR_ROOT} check-dockerregistry-installation
 
-.PHONY: remove-serverless
-remove-serverless: ## Remove serverless-cr and serverless operator
-	make -C ${OPERATOR_ROOT} remove-serverless undeploy
+.PHONY: remove-dockerregistry
+remove-dockerregistry: ## Remove dockerregistry-cr and dockerregistry operator
+	make -C ${OPERATOR_ROOT} remove-dockerregistry undeploy
 
 .PHONY: run
-run: create-k3d install-serverless-main ## Create k3d cluster and install serverless from main
+run: create-k3d install-dockerregistry-main ## Create k3d cluster and install dockerregistry from main
 
 check-var = $(if $(strip $($1)),,$(error "$1" is not defined))
 

README.md

@@ -64,13 +64,13 @@ kubectl apply -f https://github.com/kyma-project/serverless-manager/releases/lat
 - Create a Serverless instance.
 
     ```bash
-    kubectl apply -f config/samples/default-serverless-cr.yaml
+    kubectl apply -f config/samples/default-dockerregistry-cr.yaml
     ```
 
 - Delete a Serverless instance.
 
     ```bash
-    kubectl delete -f config/samples/default-serverless-cr.yaml
+    kubectl delete -f config/samples/default-dockerregistry-cr.yaml
     ```
 
 - Use external registry.

components/operator/.dockerignore

@@ -7,4 +7,4 @@
 !components/operator/internal
 !go.sum
 !go.mod
-!config/serverless
+!config/docker-registry

components/operator/Dockerfile

@@ -1,5 +1,5 @@
 #
-# This Dockerfile is used to build serverless-operator image on every pre- and post-submit job
+# This Dockerfile is used to build dockerregistry-operator image on every pre- and post-submit job
 #
 
 
@@ -23,11 +23,12 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o operator ./components/o
 
 
 # Replace main images in values.yaml
-# Bumping serverless images in the values.yaml - used for building "local" and "dev" images
+# Bumping dockerregistry images in the values.yaml - used for building "local" and "dev" images
 FROM alpine:3.19.1 as replacer
 
 WORKDIR /workspace
 
+# TODO: remove variable PURPOSE
 ARG PURPOSE
 ARG IMG_DIRECTORY
 ARG IMG_VERSION
@@ -39,21 +40,17 @@ ENV PROJECT_ROOT="."
 RUN apk update && apk add bash yq
 
 COPY components/operator/hack components/operator/hack
-COPY config/serverless config/serverless
+COPY config/docker-registry config/docker-registry
 COPY hack/ hack/
 
-RUN if [[ "dev" = "$PURPOSE" ]] ; then ./hack/replace_serverless_chart_images.sh all ; fi
-RUN if [[ "local" = "$PURPOSE" ]] ; then ./hack/replace_serverless_chart_images.sh main-only ; fi
-# do nothing (keep unchanged versions) for "release"
-
 
 # Use distroless as minimal base image to package the operator binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
 FROM gcr.io/distroless/static:nonroot
 
 WORKDIR /
 COPY --chown=65532:65532 --from=builder /workspace/operator .
-COPY --chown=65532:65532 --from=replacer /workspace/config/serverless /module-chart
+COPY --chown=65532:65532 --from=replacer /workspace/config/docker-registry /module-chart
 USER 65532:65532
 
 ENTRYPOINT ["/operator"]