Skip to content

Commit 402e5bb

Browse files
anoipmanoipm
authored
Merge branch 'main' into remove-legacy-mode-registry
2 parents 884c299 + 0e8cbd5 commit 402e5bb

8 files changed

Lines changed: 4 additions & 248 deletions

File tree

‎components/operator/internal/legacy/pvc.go‎

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

‎components/operator/internal/legacy/pvc_test.go‎

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

‎components/operator/internal/legacy/resources.go‎

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

‎components/operator/internal/state/apply.go‎

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,9 @@ import (
55
"fmt"
66
"os"
77

8-
"github.com/kyma-project/manager-toolkit/installation/base/resource"
98
"github.com/kyma-project/manager-toolkit/installation/chart"
10-
"github.com/kyma-project/manager-toolkit/installation/chart/action"
119
"github.com/kyma-project/serverless/components/operator/api/v1alpha1"
1210
"github.com/kyma-project/serverless/components/operator/internal/flags"
13-
"github.com/kyma-project/serverless/components/operator/internal/legacy"
14-
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
1511
ctrl "sigs.k8s.io/controller-runtime"
1612
"sigs.k8s.io/controller-runtime/pkg/client"
1713
)
@@ -34,7 +30,7 @@ func sFnApplyResources(ctx context.Context, r *reconciler, s *systemState) (stat
3430
updateImages(s.flagsBuilder, fipsModeEnabled)
3531

3632
// install component
37-
err := install(ctx, r, s)
33+
err := install(s)
3834
if err != nil {
3935
fmt.Println(err)
4036
r.log.Warnf("error while installing resource %s: %s",
@@ -52,36 +48,24 @@ func sFnApplyResources(ctx context.Context, r *reconciler, s *systemState) (stat
5248
return nextState(sFnVerifyResources)
5349
}
5450

55-
func install(ctx context.Context, r *reconciler, s *systemState) error {
51+
func install(s *systemState) error {
5652
flags, err := s.flagsBuilder.Build()
5753
if err != nil {
5854
return err
5955
}
6056

6157
return chart.Install(s.chartConfig, &chart.InstallOpts{
6258
CustomFlags: flags,
63-
PreActions: []action.PreApply{
64-
// TODO: remove this callback after deleting legacy serverless
65-
action.PreApplyWithPredicate(
66-
adjustPVCPreApplyAction(ctx, r.client),
67-
resource.HasKind("PersistentVolumeClaim"),
68-
),
69-
},
7059
})
7160
}
7261

7362
func updateImages(fb *flags.Builder, fipsModeEnabled bool) {
74-
updateImageIfOverride("IMAGE_FUNCTION_CONTROLLER", fb.WithImageFunctionBuildfulController, fipsModeEnabled)
7563
updateImageIfOverride("IMAGE_FUNCTION_BUILDLESS_CONTROLLER", fb.WithImageFunctionController, fipsModeEnabled)
76-
updateImageIfOverride("IMAGE_FUNCTION_BUILD_INIT", fb.WithImageFunctionBuildInit, fipsModeEnabled)
7764
updateImageIfOverride("IMAGE_FUNCTION_BUILDLESS_INIT", fb.WithImageFunctionInit, fipsModeEnabled)
78-
updateImageIfOverride("IMAGE_REGISTRY_INIT", fb.WithImageRegistryInit, fipsModeEnabled)
7965
updateImageIfOverride("IMAGE_FUNCTION_RUNTIME_NODEJS20", fb.WithImageFunctionRuntimeNodejs20, fipsModeEnabled)
8066
updateImageIfOverride("IMAGE_FUNCTION_RUNTIME_NODEJS22", fb.WithImageFunctionRuntimeNodejs22, fipsModeEnabled)
8167
updateImageIfOverride("IMAGE_FUNCTION_RUNTIME_NODEJS24", fb.WithImageFunctionRuntimeNodejs24, fipsModeEnabled)
8268
updateImageIfOverride("IMAGE_FUNCTION_RUNTIME_PYTHON312", fb.WithImageFunctionRuntimePython312, fipsModeEnabled)
83-
updateImageIfOverride("IMAGE_KANIKO_EXECUTOR", fb.WithImageKanikoExecutor, fipsModeEnabled)
84-
updateImageIfOverride("IMAGE_REGISTRY", fb.WithImageRegistry, fipsModeEnabled)
8569
}
8670

8771
func updateImageIfOverride(envName string, updateFunction flags.ImageReplace, fipsModeEnabled bool) {
@@ -93,11 +77,3 @@ func updateImageIfOverride(envName string, updateFunction flags.ImageReplace, fi
9377
updateFunction(imageName)
9478
}
9579
}
96-
97-
func adjustPVCPreApplyAction(ctx context.Context, c client.Client) action.PreApply {
98-
return func(u *unstructured.Unstructured) error {
99-
adjusted, err := legacy.AdjustDockerRegToClusterPVCSize(ctx, c, *u)
100-
*u = adjusted
101-
return err
102-
}
103-
}

‎components/operator/internal/state/delete.go‎

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,8 @@ import (
44
"context"
55
"time"
66

7-
"github.com/kyma-project/manager-toolkit/installation/base/resource"
87
"github.com/kyma-project/manager-toolkit/installation/chart"
9-
"github.com/kyma-project/manager-toolkit/installation/chart/action"
108
"github.com/kyma-project/serverless/components/operator/api/v1alpha1"
11-
"github.com/kyma-project/serverless/components/operator/internal/legacy"
12-
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
139
ctrl "sigs.k8s.io/controller-runtime"
1410
"sigs.k8s.io/controller-runtime/pkg/client"
1511
)
@@ -38,32 +34,8 @@ func sFnDeleteResources(ctx context.Context, r *reconciler, s *systemState) (sta
3834
return deleteResourcesWithFilter(ctx, r, s)
3935
}
4036

41-
func deleteResourcesWithFilter(ctx context.Context, r *reconciler, s *systemState) (stateFn, *ctrl.Result, error) {
42-
done, err := chart.Uninstall(s.chartConfig, &chart.UninstallOpts{
43-
// these resources have finalizer and the serverless-ctrl-mngr will remove them from all namespaces
44-
UninstallFirst: resource.OrPredicates(
45-
resource.AndPredicates(
46-
resource.HasKind("ConfigMap"),
47-
resource.HasLabel(legacy.ConfigLabelKey, legacy.DockerfileConfigmapLabelValue),
48-
),
49-
resource.AndPredicates(
50-
resource.HasKind("Secret"),
51-
resource.HasLabel(legacy.ConfigLabelKey, legacy.RegistrySecretLabelValue),
52-
),
53-
),
54-
// this resource is spread in all namespaces, but serverless-ctrl-mngr is not removing them
55-
PostActions: []action.PostUninstall{
56-
action.PostUninstallWithPredicate(
57-
func(u unstructured.Unstructured) (bool, error) {
58-
return legacy.RemoveResourceFromAllNamespaces(ctx, r.client, r.log, u)
59-
},
60-
resource.AndPredicates(
61-
resource.HasKind("ServiceAccount"),
62-
resource.HasLabel(legacy.ConfigLabelKey, legacy.ServiceAccountLabelValue),
63-
),
64-
),
65-
},
66-
})
37+
func deleteResourcesWithFilter(_ context.Context, r *reconciler, s *systemState) (stateFn, *ctrl.Result, error) {
38+
done, err := chart.Uninstall(s.chartConfig, &chart.UninstallOpts{})
6739
if err != nil {
6840
return uninstallResourcesError(r, s, err)
6941
}

‎config/operator/base/deployment/deployment.yaml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -76,17 +76,6 @@ spec:
7676
value: europe-docker.pkg.dev/kyma-project/prod/function-buildless-init:main
7777
- name: IMAGE_FUNCTION_BUILDLESS_INIT_FIPS
7878
value: europe-docker.pkg.dev/kyma-project/prod/function-buildless-init:main
79-
# Images used by serverless running in legacy mode (without buildless)
80-
- name: IMAGE_FUNCTION_CONTROLLER
81-
value: europe-docker.pkg.dev/kyma-project/prod/function-controller:main
82-
- name: IMAGE_FUNCTION_BUILD_INIT
83-
value: europe-docker.pkg.dev/kyma-project/prod/function-build-init:main
84-
- name: IMAGE_REGISTRY_INIT
85-
value: europe-docker.pkg.dev/kyma-project/prod/registry-init:v20240506-57d31b1d
86-
- name: IMAGE_KANIKO_EXECUTOR
87-
value: europe-docker.pkg.dev/kyma-project/prod/external/gcr.io/kaniko-project/executor:v1.24.0
88-
- name: IMAGE_REGISTRY
89-
value: europe-docker.pkg.dev/kyma-project/prod/external/library/registry:3.0.0
9079
securityContext:
9180
allowPrivilegeEscalation: false
9281
capabilities:

‎external-images.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ images:
44
tag: "3.23.3"
55
- source: "golang@sha256:c2a1f7b2095d046ae14b286b18413a05bb82c9bca9b25fe7ff5efef0f0826166"
66
tag: "1.26.2-alpine3.23"
7-
- source: "gcr.io/kaniko-project/executor@sha256:4e7a52dd1f14872430652bb3b027405b8dfd17c4538751c620ac005741ef9698"
8-
tag: "v1.24.0"
97
- source: "ghcr.io/nginx/alpine-fips@sha256:15cf5753964eca17557083313d2a39e6a3cc659a5a2143ecebc476b14cc687e6"
108
tag: "0.5.0-alpine3.23"
119
# https://hub.docker.com/layers/library/node/24-alpine

‎sec-scanners-config.yaml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
module-name: serverless
22
kind: kyma
33
bdba:
4-
- europe-docker.pkg.dev/kyma-project/prod/function-controller:main
5-
- europe-docker.pkg.dev/kyma-project/prod/function-build-init:main
6-
- europe-docker.pkg.dev/kyma-project/prod/registry-init:v20240506-57d31b1d
74
- europe-docker.pkg.dev/kyma-project/prod/function-runtime-nodejs20:main
85
- europe-docker.pkg.dev/kyma-project/prod/function-runtime-nodejs22:main
96
- europe-docker.pkg.dev/kyma-project/prod/function-runtime-nodejs24:main
@@ -12,8 +9,6 @@ bdba:
129
- europe-docker.pkg.dev/kyma-project/restricted-prod/function-runtime-nodejs22-fips:main
1310
- europe-docker.pkg.dev/kyma-project/restricted-prod/function-runtime-nodejs24-fips:main
1411
- europe-docker.pkg.dev/kyma-project/restricted-prod/function-runtime-python314-fips:main
15-
- europe-docker.pkg.dev/kyma-project/prod/external/gcr.io/kaniko-project/executor:v1.24.0
16-
- europe-docker.pkg.dev/kyma-project/prod/external/library/registry:3.0.0
1712
- europe-docker.pkg.dev/kyma-project/prod/serverless-operator:main
1813
- europe-docker.pkg.dev/kyma-project/prod/function-buildless-controller:main
1914
- europe-docker.pkg.dev/kyma-project/prod/function-buildless-init:main

0 commit comments

Comments
 (0)