Skip to content

Commit

Permalink
upgrade dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
ottersbot committed Dec 12, 2024
1 parent 39c8abc commit e36bdcf
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 29 deletions.
7 changes: 4 additions & 3 deletions components/buildless-serverless/config/crd/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@
# since it depends on service name and namespace that are out of this kustomize package.
# It should be run by config/default
resources:
- bases/serverless.kyma-project.io_functions.yaml
# +kubebuilder:scaffold:crdkustomizeresource

- bases/serverless.kyma-project.io_functions.yaml
# +kubebuilder:scaffold:crdkustomizeresource
patches:
commonLabels:
app.kubernetes.io/version: 1.6.0
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
# patches here are for enabling the conversion webhook for each CRD
# +kubebuilder:scaffold:crdkustomizewebhookpatch
Expand Down
13 changes: 3 additions & 10 deletions components/serverless/config/crd/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,18 @@ resources:
#- patches/cainjection_in_functions.yaml
# +kubebuilder:scaffold:crdkustomizecainjectionpatch
patches:
- patch: |
- op: add
path: "/metadata/labels"
value:
app.kubernetes.io/component: serverless
app.kubernetes.io/instance: functions.serverless.kyma-project.io
- patch: "- op: add\n path: \"/metadata/labels\"\n value: \n app.kubernetes.io/component: serverless\n app.kubernetes.io/instance: functions.serverless.kyma-project.io\n"
target:
group: apiextensions.k8s.io
version: v1
kind: CustomResourceDefinition
name: functions.serverless.kyma-project.io
commonLabels:
kyma-project.io/module: serverless
app.kubernetes.io/name: serverless
app.kubernetes.io/version: "main"
app.kubernetes.io/version: "1.6.0"
app.kubernetes.io/part-of: serverless
app.kubernetes.io/managed-by: kustomize

# the following config is for teaching kustomize how to do kustomization for CRDs.
configurations:
- kustomizeconfig.yaml
- kustomizeconfig.yaml
2 changes: 2 additions & 0 deletions config/buildless-serverless/templates/crds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.4
labels:
app.kubernetes.io/version: 1.6.0
name: functions.serverless.kyma-project.io
spec:
group: serverless.kyma-project.io
Expand Down
6 changes: 3 additions & 3 deletions config/buildless-serverless/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ global:
images:
function_controller:
name: "function-buildless-controller"
version: "main"
version: "1.6.0"
directory: "prod"
function_runtime_nodejs20:
name: "function-runtime-nodejs20"
version: "main"
version: "1.6.0"
directory: "prod"
function_runtime_python312:
name: "function-runtime-python312"
version: "main"
version: "1.6.0"
directory: "prod"
2 changes: 1 addition & 1 deletion config/serverless/templates/crds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
app.kubernetes.io/managed-by: kustomize
app.kubernetes.io/name: serverless
app.kubernetes.io/part-of: serverless
app.kubernetes.io/version: main
app.kubernetes.io/version: 1.6.0
kyma-project.io/module: serverless
name: functions.serverless.kyma-project.io
spec:
Expand Down
10 changes: 5 additions & 5 deletions config/serverless/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,27 +76,27 @@ global:
images:
function_controller:
name: "function-controller"
version: "main"
version: "1.6.0"
directory: "prod"
function_build_init:
name: "function-build-init"
version: "main"
version: "1.6.0"
directory: "prod"
registry_init: # https://github.com/kyma-project/docker-registry/tree/main/components/registry-init
name: "registry-init"
version: "v20240506-57d31b1d"
directory: "prod"
function_runtime_nodejs20:
name: "function-runtime-nodejs20"
version: "main"
version: "1.6.0"
directory: "prod"
function_runtime_nodejs22:
name: "function-runtime-nodejs22"
version: "main"
version: "1.6.0"
directory: "prod"
function_runtime_python312:
name: "function-runtime-python312"
version: "main"
version: "1.6.0"
directory: "prod"
kaniko_executor:
name: "gcr.io/kaniko-project/executor"
Expand Down
1 change: 1 addition & 0 deletions libgit2
Submodule libgit2 added at 26c68a
14 changes: 7 additions & 7 deletions sec-scanners-config.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
module-name: serverless
rc-tag: 1.5.0
protecode:
- europe-docker.pkg.dev/kyma-project/prod/serverless-operator:main
- europe-docker.pkg.dev/kyma-project/prod/function-controller:main
- europe-docker.pkg.dev/kyma-project/prod/function-build-init:main
- europe-docker.pkg.dev/kyma-project/prod/function-runtime-nodejs20:main
- europe-docker.pkg.dev/kyma-project/prod/function-runtime-nodejs22:main
- europe-docker.pkg.dev/kyma-project/prod/function-runtime-python312:main
- europe-docker.pkg.dev/kyma-project/prod/serverless-operator:1.6.0
- europe-docker.pkg.dev/kyma-project/prod/function-controller:1.6.0
- europe-docker.pkg.dev/kyma-project/prod/function-build-init:1.6.0
- europe-docker.pkg.dev/kyma-project/prod/registry-init:v20240506-57d31b1d
- europe-docker.pkg.dev/kyma-project/prod/function-runtime-nodejs20:1.6.0
- europe-docker.pkg.dev/kyma-project/prod/function-runtime-nodejs22:1.6.0
- europe-docker.pkg.dev/kyma-project/prod/function-runtime-python312:1.6.0
- europe-docker.pkg.dev/kyma-project/prod/external/gcr.io/kaniko-project/executor:v1.23.2
- europe-docker.pkg.dev/kyma-project/prod/external/library/registry:2.8.3-v1
- europe-docker.pkg.dev/kyma-project/prod/registry-init:v20240506-57d31b1d
whitesource:
language: golang-mod
subprojects: false
Expand Down

0 comments on commit e36bdcf

Please sign in to comment.