Skip to content

Commit 500bfd5

Browse files
robertgraeffrobertgraeff
authored
fix: change to correct components ocm registry
fix: change to correct components ocm registry
2 parents edaed4b + 7ff782d commit 500bfd5

File tree

7 files changed

+58
-48
lines changed

7 files changed

+58
-48
lines changed

‎.ci/component_descriptor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ echo "create dummy component descriptor BEGIN"
1010

1111
SOURCE_PATH="$(dirname $0)/.."
1212
VERSION="$(${SOURCE_PATH}/hack/get-version.sh)"
13-
REPO_CTX="ghcr.io/openmcp-project"
13+
REPO_CTX="ghcr.io/openmcp-project/components"
1414
COMPONENT_DESCRIPTOR_DIR="${SOURCE_PATH}/../${COMPONENT_DESCRIPTOR_DIR}"
1515

1616
VERSION="${VERSION}-dummy" REPO_CTX="${REPO_CTX}" COMPONENT_DESCRIPTOR_DIR="${COMPONENT_DESCRIPTOR_DIR}" python ${SOURCE_PATH}/hack/create-dummy-cd.py

‎Makefile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ BUILD_OS := "linux"
1212
BUILD_ARCH := "amd64"
1313

1414
REGISTRY := ghcr.io/openmcp-project
15+
OCM_REGISTRY := $(REGISTRY)/components
1516
DOCKER_BUILDER_NAME := "ls-multiarch"
1617

1718
DISABLE_CLEANUP := false
@@ -95,7 +96,7 @@ docker-images: build ## Builds images for all controllers locally. The images ar
9596

9697
.PHONY: component
9798
component: ocm ## Builds and pushes the Component Descriptor. Also pushes the images and combines them into multi-platform images. Requires the docker images to have been built before.
98-
@OCM=$(OCM) $(REPO_ROOT)/hack/generate-cd.sh $(REGISTRY)
99+
@OCM=$(OCM) $(REPO_ROOT)/hack/generate-cd.sh $(OCM_REGISTRY)
99100

100101
.PHONY: build-resources ## Wrapper for 'make docker-images component'.
101102
build-resources: docker-images component
@@ -224,4 +225,4 @@ registry: localbin ## Download registry locally if necessary. If wrong version i
224225

225226
.PHONY: release
226227
release:
227-
@$(REPO_ROOT)/hack/release.sh
228+
@$(REPO_ROOT)/hack/release.sh

‎charts/container-deployer/values.yaml‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,29 +16,29 @@ deployer:
1616
# kubeconfig: |
1717
# <landscaper-cluster-kubeconfig>
1818

19-
# identity: ""
20-
# namespace: ""
19+
# identity: ""
20+
# namespace: ""
2121
initContainer:
22-
repository: ghcr.io/openmcp-project/github.com/openmcp-project/landscaper/container-deployer/images/container-deployer-init
23-
# tag: v1.0.2
22+
repository: ghcr.io/openmcp-project/components/github.com/openmcp-project/landscaper/container-deployer/images/container-deployer-init
23+
# tag: v1.0.2
2424
waitContainer:
25-
repository: ghcr.io/openmcp-project/github.com/openmcp-project/landscaper/container-deployer/images/container-deployer-wait
26-
# tag: v1.0.2
27-
# defaultImage:
28-
# repository: ubuntu
29-
# tag: v1.0.2
25+
repository: ghcr.io/openmcp-project/components/github.com/openmcp-project/landscaper/container-deployer/images/container-deployer-wait
26+
# tag: v1.0.2
27+
# defaultImage:
28+
# repository: ubuntu
29+
# tag: v1.0.2
3030
oci:
3131
allowPlainHttp: false
3232
insecureSkipVerify: false
3333
secrets: {}
34-
# <name>: <docker config json>
35-
# verbosityLevel: info
34+
# <name>: <docker config json>
35+
# verbosityLevel: info
3636

37-
# targetSelector:
38-
# - annotations:
39-
# - key:
40-
# operator:
41-
# value:
37+
# targetSelector:
38+
# - annotations:
39+
# - key:
40+
# operator:
41+
# value:
4242

4343
controller:
4444
workers: 30
@@ -79,10 +79,12 @@ serviceAccount:
7979

8080
podAnnotations: {}
8181

82-
podSecurityContext: {}
82+
podSecurityContext:
83+
{}
8384
# fsGroup: 2000
8485

85-
securityContext: {}
86+
securityContext:
87+
{}
8688
# capabilities:
8789
# drop:
8890
# - ALL

‎charts/helm-deployer/values.yaml‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@ deployer:
1616
# kubeconfig: |
1717
# <landscaper-cluster-kubeconfig>
1818

19-
# identity: ""
19+
# identity: ""
2020
namespace: ""
2121
oci:
2222
allowPlainHttp: false
2323
insecureSkipVerify: false
2424
secrets: {}
25-
# <name>: <docker config json>
26-
# verbosityLevel: info
25+
# <name>: <docker config json>
26+
# verbosityLevel: info
2727

28-
# targetSelector:
29-
# - annotations:
30-
# - key:
31-
# operator:
32-
# value:
28+
# targetSelector:
29+
# - annotations:
30+
# - key:
31+
# operator:
32+
# value:
3333

3434
controller:
3535
workers: 30
@@ -50,7 +50,7 @@ deployer:
5050
replicaCount: 1
5151

5252
image:
53-
repository: ghcr.io/openmcp-project/github.com/openmcp-project/landscaper/helm-deployer/images/helm-deployer-controller
53+
repository: ghcr.io/openmcp-project/components/github.com/openmcp-project/landscaper/helm-deployer/images/helm-deployer-controller
5454
pullPolicy: IfNotPresent
5555
# Overrides the image tag whose default is the chart appVersion.
5656
# tag: ""
@@ -70,10 +70,12 @@ serviceAccount:
7070

7171
podAnnotations: {}
7272

73-
podSecurityContext: {}
73+
podSecurityContext:
74+
{}
7475
# fsGroup: 2000
7576

76-
securityContext: {}
77+
securityContext:
78+
{}
7779
# capabilities:
7880
# drop:
7981
# - ALL

‎charts/manifest-deployer/values.yaml‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ deployer:
1616
# kubeconfig: |
1717
# <landscaper-cluster-kubeconfig>
1818

19-
# identity: ""
19+
# identity: ""
2020
namespace: ""
21-
# verbosityLevel: info
21+
# verbosityLevel: info
2222

23-
# targetSelector:
24-
# - annotations:
25-
# - key:
26-
# operator:
27-
# value:
23+
# targetSelector:
24+
# - annotations:
25+
# - key:
26+
# operator:
27+
# value:
2828

2929
controller:
3030
workers: 30
@@ -45,7 +45,7 @@ deployer:
4545
replicaCount: 1
4646

4747
image:
48-
repository: ghcr.io/openmcp-project/github.com/openmcp-project/landscaper/manifest-deployer/images/manifest-deployer-controller
48+
repository: ghcr.io/openmcp-project/components/github.com/openmcp-project/landscaper/manifest-deployer/images/manifest-deployer-controller
4949
pullPolicy: IfNotPresent
5050
# Overrides the image tag whose default is the chart appVersion.
5151
# tag: ""
@@ -65,10 +65,12 @@ serviceAccount:
6565

6666
podAnnotations: {}
6767

68-
podSecurityContext: {}
68+
podSecurityContext:
69+
{}
6970
# fsGroup: 2000
7071

71-
securityContext: {}
72+
securityContext:
73+
{}
7274
# capabilities:
7375
# drop:
7476
# - ALL

‎charts/mock-deployer/values.yaml‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ deployer:
1818
# kubeconfig: |
1919
# <landscaper-cluster-kubeconfig>
2020

21-
# identity: ""
21+
# identity: ""
2222
namespace: ""
2323

2424
# burst and max queries per second settings for k8s client used in reconciliation
@@ -34,7 +34,7 @@ deployer:
3434
qps: 40
3535

3636
image:
37-
repository: ghcr.io/openmcp-project/github.com/openmcp-project/landscaper/mock-deployer/images/mock-deployer-controller
37+
repository: ghcr.io/openmcp-project/components/github.com/openmcp-project/landscaper/mock-deployer/images/mock-deployer-controller
3838
pullPolicy: IfNotPresent
3939
# Overrides the image tag whose default is the chart appVersion.
4040
#tag: ""
@@ -54,18 +54,21 @@ serviceAccount:
5454

5555
podAnnotations: {}
5656

57-
podSecurityContext: {}
57+
podSecurityContext:
58+
{}
5859
# fsGroup: 2000
5960

60-
securityContext: {}
61+
securityContext:
62+
{}
6163
# capabilities:
6264
# drop:
6365
# - ALL
6466
# readOnlyRootFilesystem: true
6567
# runAsNonRoot: true
6668
# runAsUser: 1000
6769

68-
resources: {}
70+
resources:
71+
{}
6972
# We usually recommend not to specify default resources and to leave this as a conscious
7073
# choice for the user. This also increases chances charts run on environments with little
7174
# resources, such as Minikube. If you do want to specify resources, uncomment the following

‎hack/int-test-helper/install-landscaper-dual‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ if [[ -z $INGRESS_URL ]]; then
5858
exit 1
5959
fi
6060

61-
OCI_REPO="ghcr.io/openmcp-project"
61+
OCI_REPO="ghcr.io/openmcp-project/components"
6262
COMPONENT_NAME="github.com/openmcp-project/landscaper"
6363

6464
echo "> Pull landscaper charts"

0 commit comments

Comments
 (0)