Skip to content

establishing compatibility with Apple architecture #560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mdroll merged 1 commit into from
Sep 7, 2026
Merged

establishing compatibility with Apple architecture #560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,18 @@
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-test</artifactId>
</exclusion>
<!-- jline 2.14.6 (via groovy-groovysh) bundles Jansi 1.x with an x86-only macOS
native lib. On Apple Silicon (arm64) picocli's reflective AnsiConsole check then
dies with UnsatisfiedLinkError (picocli only catches Exception, not Error).
groovysh/jline are unused in tests, so exclude them. -->
<exclusion>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-groovysh</artifactId>
</exclusion>
<exclusion>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
</exclusion>
</exclusions>
</dependency>

Expand Down
6 changes: 3 additions & 3 deletions scripts/dev/mirror_images_to_registry.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ CERT_MANAGER_CA_INJECTOR="docker://quay.io/jetstack/cert-manager-cainjector:v1.1
CERT_MANAGER_WEBHOOK="docker://quay.io/jetstack/cert-manager-webhook:v1.16.1"

KUBECTL_IMAGE="docker://alpine/kubectl:latest"
TEMURIN_IMAGE="docker://eclipse-temurin:17-jre-alpine"
TEMURIN_IMAGE="docker://eclipse-temurin:17-jre"
HELM_IMAGE="docker://ghcr.io/cloudogu/helm:latest"
MVN_IMAGE="docker://maven:3-eclipse-temurin-17-alpine"
YAMLLINT_IMAGE="docker://cytopia/yamllint:latest"
Expand Down Expand Up @@ -98,7 +98,7 @@ if [[ -n $HARBOR ]]; then

# Needed for the builds to work with proxy-registry
skopeo copy $KUBECTL_IMAGE --dest-creds Proxy:Proxy12345 --dest-tls-verify=false $REGISTRY_DOCKER_BASE_URL/proxy/alpine/kubectl:latest
skopeo copy $TEMURIN_IMAGE --dest-creds Proxy:Proxy12345 --dest-tls-verify=false $REGISTRY_DOCKER_BASE_URL/proxy/eclipse-temurin:17-jre-alpine
skopeo copy $TEMURIN_IMAGE --dest-creds Proxy:Proxy12345 --dest-tls-verify=false $REGISTRY_DOCKER_BASE_URL/proxy/eclipse-temurin:17-jre
skopeo copy $HELM_IMAGE --dest-creds Proxy:Proxy12345 --dest-tls-verify=false $REGISTRY_DOCKER_BASE_URL/proxy/helm:latest
skopeo copy $MVN_IMAGE --dest-creds Proxy:Proxy12345 --dest-tls-verify=false $REGISTRY_DOCKER_BASE_URL/proxy/maven:3-eclipse-temurin-17-alpine
skopeo copy $YAMLLINT_IMAGE --dest-creds Proxy:Proxy12345 --dest-tls-verify=false $REGISTRY_DOCKER_BASE_URL/proxy/yamllint:latest
Expand Down Expand Up @@ -129,7 +129,7 @@ skopeo copy $CERT_MANAGER_WEBHOOK --dest-creds admin:Harbor12345 --dest-tls-veri

# Needed for the builds to work with proxy-registry
skopeo copy $KUBECTL_IMAGE --dest-creds admin:Harbor12345 --dest-tls-verify=false $REGISTRY_DOCKER_BASE_URL/library/alpine/kubectl:latest
skopeo copy $TEMURIN_IMAGE --dest-creds admin:Harbor12345 --dest-tls-verify=false $REGISTRY_DOCKER_BASE_URL/library/eclipse-temurin:17-jre-alpine
skopeo copy $TEMURIN_IMAGE --dest-creds admin:Harbor12345 --dest-tls-verify=false $REGISTRY_DOCKER_BASE_URL/library/eclipse-temurin:17-jre
skopeo copy $HELM_IMAGE --dest-creds admin:Harbor12345 --dest-tls-verify=false $REGISTRY_DOCKER_BASE_URL/library/helm:latest
skopeo copy $MVN_IMAGE --dest-creds admin:Harbor12345 --dest-tls-verify=false $REGISTRY_DOCKER_BASE_URL/library/maven:3-eclipse-temurin-17-alpine
skopeo copy $YAMLLINT_IMAGE --dest-creds admin:Harbor12345 --dest-tls-verify=false $REGISTRY_DOCKER_BASE_URL/library/yamllint:latest
2 changes: 1 addition & 1 deletion scripts/dev/prepare_two_registries.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ content:
kubeval: "localhost:30000/proxy/helm:latest"
helmKubeval: "localhost:30000/proxy/helm:latest"
yamllint: "localhost:30000/proxy/cytopia/yamllint:latest"
petclinic: "localhost:30000/proxy/eclipse-temurin:17-jre-alpine"
petclinic: "localhost:30000/proxy/eclipse-temurin:17-jre"
maven: "localhost:30000/proxy/maven:3-eclipse-temurin-17-alpine"
registry:
internalPort: 30000
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/application-content-examples.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,5 @@ content:
kubeval: "ghcr.io/cloudogu/helm:latest"
helmKubeval: "ghcr.io/cloudogu/helm:latest"
yamllint: "cytopia/yamllint:1.25-0.7"
petclinic: "eclipse-temurin:17-jre-alpine"
petclinic: "eclipse-temurin:17-jre"
maven: ""
2 changes: 1 addition & 1 deletion src/main/resources/application-full-prefix.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,5 @@ content:
kubeval: "ghcr.io/cloudogu/helm:latest"
helmKubeval: "ghcr.io/cloudogu/helm:latest"
yamllint: "cytopia/yamllint:1.25-0.7"
petclinic: "eclipse-temurin:17-jre-alpine"
petclinic: "eclipse-temurin:17-jre"
maven: ""
2 changes: 1 addition & 1 deletion src/main/resources/application-full.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,5 @@ content:
kubeval: "ghcr.io/cloudogu/helm:latest"
helmKubeval: "ghcr.io/cloudogu/helm:latest"
yamllint: "cytopia/yamllint:1.25-0.7"
petclinic: "eclipse-temurin:17-jre-alpine"
petclinic: "eclipse-temurin:17-jre"
maven: ""
2 changes: 1 addition & 1 deletion src/main/resources/application-keycloak.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,5 +92,5 @@ content:
kubeval: "ghcr.io/cloudogu/helm:latest"
helmKubeval: "ghcr.io/cloudogu/helm:latest"
yamllint: "cytopia/yamllint:1.25-0.7"
petclinic: "eclipse-temurin:17-jre-alpine"
petclinic: "eclipse-temurin:17-jre"
maven: ""
2 changes: 1 addition & 1 deletion src/main/resources/application-operator-content-examples.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,5 @@ content:
kubeval: "ghcr.io/cloudogu/helm:latest"
helmKubeval: "ghcr.io/cloudogu/helm:latest"
yamllint: "cytopia/yamllint:1.25-0.7"
petclinic: "eclipse-temurin:17-jre-alpine"
petclinic: "eclipse-temurin:17-jre"
maven: ""
2 changes: 1 addition & 1 deletion src/main/resources/application-operator-full.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,5 +63,5 @@ content:
kubeval: "ghcr.io/cloudogu/helm:latest"
helmKubeval: "ghcr.io/cloudogu/helm:latest"
yamllint: "cytopia/yamllint:1.25-0.7"
petclinic: "eclipse-temurin:17-jre-alpine"
petclinic: "eclipse-temurin:17-jre"
maven: ""
10 changes: 5 additions & 5 deletions src/test/groovy/com/cloudogu/gitops/tools/core/argocd/ArgoCDTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ class ArgoCDTest {
kubeval : 'ghcr.io/cloudogu/helm:4.2.1-1',
helmKubeval: 'ghcr.io/cloudogu/helm:4.2.1-1',
yamllint : 'cytopia/yamllint:1.25-0.7',
petclinic : 'eclipse-temurin:17-jre-alpine',
petclinic : 'eclipse-temurin:17-jre',
maven : '']]],
features: [argocd : [operator : false,
active : true,
Expand Down Expand Up @@ -1679,10 +1679,10 @@ class ArgoCDTest {
ArgoCDTestContext testContext) {
super(k8sClient,
new HelmClient(helmCommands),
new FileSystemUtils(),
testContext.gitHandler,
new DeploymentModeFactory(),
new ArgoCDToolConfigMapper(cfg))
new FileSystemUtils(),
testContext.gitHandler,
new DeploymentModeFactory(),
new ArgoCDToolConfigMapper(cfg))

this.cfg = cfg
this.tenantProvider = tenantProvider
Expand Down