Skip to content

Commit 6f15df8

Browse files
committed
Refactor files and docu that contain bitnami/kubectl images and rename bitnami to bitnamilegacy.
1 parent 3aa501b commit 6f15df8

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ def gitopsConfig = [
469469
...
470470
buildImages : [
471471
helm: 'ghcr.io/cloudogu/helm:3.10.3-1',
472-
kubectl: 'bitnami/kubectl:1.29',
472+
kubectl: 'bitnamilegacy/kubectl:1.29',
473473
kubeval: 'ghcr.io/cloudogu/helm:3.10.3-1',
474474
helmKubeval: 'ghcr.io/cloudogu/helm:3.10.3-1',
475475
yamllint: 'cytopia/yamllint:1.25-0.7'
@@ -624,7 +624,7 @@ When you encounter errors with port 80 you might want to use e.g.
624624
* If you must, you can also run using Docker Desktop from native Windows console (see bellow)
625625
* However, there seems to be a problem when the Jenkins Jobs running the playground access docker, e.g.
626626
```
627-
$ docker run -t -d -u 0:133 -v ... -e ******** bitnami/kubectl:1.25.4 cat
627+
$ docker run -t -d -u 0:133 -v ... -e ******** bitnamilegacy/kubectl:1.25.4 cat
628628
docker top e69b92070acf3c1d242f4341eb1fa225cc40b98733b0335f7237a01b4425aff3 -eo pid,comm
629629
process apparently never started in /tmp/gitops-playground-jenkins-agent/workspace/xample-apps_petclinic-plain_main/.configRepoTempDir@tmp/durable-7f109066
630630
(running Jenkins temporarily with -Dorg.jenkinsci.plugins.durabletask.BourneShellScript.LAUNCH_DIAGNOSTICS=true might make the problem clearer)

docs/developers.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -453,15 +453,15 @@ curl -X PUT -u admin:Harbor12345 'http://localhost:30002/api/v2.0/projects/1' -
453453
454454
Then either import external images like so (requires `skopeo` but no prior pulling or insecure config necessary):
455455
```bash
456-
skopeo copy docker://bitnami/nginx:1.25.1 --dest-creds admin:Harbor12345 --dest-tls-verify=false docker://localhost:30002/library/nginx:1.25.1
456+
skopeo copy docker://bitnamilegacy/nginx:1.25.1 --dest-creds admin:Harbor12345 --dest-tls-verify=false docker://localhost:30002/library/nginx:1.25.1
457457
```
458458
459459
Alternatively, you could push existing images from your docker daemon.
460460
However, this takes longer (pull first) and you'll have to make sure to add `localhost:30002` to `insecure-registries` in `/etc/docker/daemon.json` and restart your docker daemon first.
461461

462462
```bash
463463
docker login localhost:30002 -u admin -p Harbor12345
464-
docker tag bitnami/nginx:1.25.1 localhost:30002/library/nginx:1.25.1
464+
docker tag bitnamilegacy/nginx:1.25.1 localhost:30002/library/nginx:1.25.1
465465
docker push localhost:30002/library/nginx:1.25.1
466466
```
467467

@@ -567,7 +567,7 @@ curl --fail "http://localhost:30000/api/v2.0/projects/${projectId}/members" -X
567567
skopeo copy docker://ghcr.io/cloudogu/mailhog:v1.0.1 --dest-creds Proxy:Proxy12345 --dest-tls-verify=false docker://localhost:30000/proxy/mailhog
568568
skopeo copy docker://ghcr.io/external-secrets/external-secrets:v0.9.16 --dest-creds Proxy:Proxy12345 --dest-tls-verify=false docker://localhost:30000/proxy/external-secrets
569569
skopeo copy docker://hashicorp/vault:1.14.0 --dest-creds Proxy:Proxy12345 --dest-tls-verify=false docker://localhost:30000/proxy/vault
570-
skopeo copy docker://bitnami/nginx:1.23.3-debian-11-r8 --dest-creds Proxy:Proxy12345 --dest-tls-verify=false docker://localhost:30000/proxy/nginx
570+
skopeo copy docker://bitnamilegacy/nginx:1.23.3-debian-11-r8 --dest-creds Proxy:Proxy12345 --dest-tls-verify=false docker://localhost:30000/proxy/nginx
571571
skopeo copy docker://registry.k8s.io/ingress-nginx/controller:v1.12.1 --dest-creds Proxy:Proxy12345 --dest-tls-verify=false docker://localhost:30000/proxy/ingress-nginx
572572
573573
# Monitoring
@@ -586,7 +586,7 @@ skopeo copy docker://quay.io/jetstack/cert-manager-cainjector:v1.16.1 --dest-cre
586586
skopeo copy docker://quay.io/jetstack/cert-manager-webhook:v1.16.1 --dest-creds Proxy:Proxy12345 --dest-tls-verify=false docker://localhost:30000/proxy/cert-manager-webhook
587587
588588
# Needed for the builds to work with proxy-registry
589-
skopeo copy docker://bitnami/kubectl:1.29 --dest-creds Proxy:Proxy12345 --dest-tls-verify=false docker://localhost:30000/proxy/bitnami/kubectl:1.29
589+
skopeo copy docker://bitnamilegacy/kubectl:1.29 --dest-creds Proxy:Proxy12345 --dest-tls-verify=false docker://localhost:30000/proxy/bitnami/kubectl:1.29
590590
skopeo copy docker://eclipse-temurin:17-jre-alpine --dest-creds Proxy:Proxy12345 --dest-tls-verify=false docker://localhost:30000/proxy/eclipse-temurin:17-jre-alpine
591591
skopeo copy docker://ghcr.io/cloudogu/helm:3.16.1-1 --dest-creds Proxy:Proxy12345 --dest-tls-verify=false docker://localhost:30000/proxy/helm:latest
592592
```
@@ -612,7 +612,7 @@ docker run --rm -t -u $(id -u) \
612612
--registry-proxy-password=Proxy12345 \
613613
--registry-username-read-only=RegistryRead \
614614
--registry-password-read-only=RegistryRead12345 \
615-
--kubectl-image=localhost:30000/proxy/bitnami/kubectl:1.29 \
615+
--kubectl-image=localhost:30000/proxy/bitnamilegacy/kubectl:1.29 \
616616
--helm-image=localhost:30000/proxy/helm:latest \
617617
--petclinic-image=localhost:30000/proxy/eclipse-temurin:17-jre-alpine \
618618
--mailhog-image=localhost:30000/proxy/mailhog:latest \

src/main/groovy/com/cloudogu/gitops/config/Config.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ class Config {
494494
static class ImagesSchema {
495495
@Option(names = ['--kubectl-image'], description = KUBECTL_IMAGE_DESCRIPTION)
496496
@JsonPropertyDescription(KUBECTL_IMAGE_DESCRIPTION)
497-
String kubectl = "bitnami/kubectl:$K8S_VERSION"
497+
String kubectl = "bitnamilegacy/kubectl:$K8S_VERSION"
498498

499499
// cloudogu/helm also contains kubeval and helm kubeval plugin. Using the same image makes builds faster
500500
@Option(names = ['--helm-image'], description = HELM_IMAGE_DESCRIPTION)

src/test/groovy/com/cloudogu/gitops/utils/data/contentRepos/copyRepo1/Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ void addSpecificGitOpsConfig(gitopsConfig) {
128128
// If you can access the internet, you can rely on the defaults, which load the images from public registries.
129129
buildImages : [
130130
helm: 'ghcr.io/cloudogu/helm:3.16.4-1',
131-
kubectl: 'bitnami/kubectl:1.29',
131+
kubectl: 'bitnamilegacy/kubectl:1.29',
132132
kubeval: 'ghcr.io/cloudogu/helm:3.16.4-1',
133133
helmKubeval: 'ghcr.io/cloudogu/helm:3.16.4-1',
134134
yamllint: 'cytopia/yamllint:1.25-0.7'

src/test/groovy/com/cloudogu/gitops/utils/data/contentRepos/mirrorRepo1/Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ void addSpecificGitOpsConfig(gitopsConfig) {
128128
// If you can access the internet, you can rely on the defaults, which load the images from public registries.
129129
buildImages : [
130130
helm: 'ghcr.io/cloudogu/helm:3.16.4-1',
131-
kubectl: 'bitnami/kubectl:1.29',
131+
kubectl: 'bitnamilegacy/kubectl:1.29',
132132
kubeval: 'ghcr.io/cloudogu/helm:3.16.4-1',
133133
helmKubeval: 'ghcr.io/cloudogu/helm:3.16.4-1',
134134
yamllint: 'cytopia/yamllint:1.25-0.7'

src/test/resources/testMainConfig.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ application:
5050
namespaceIsolation: false
5151
netpols: false
5252
images:
53-
kubectl: "bitnami/kubectl:1.29"
53+
kubectl: "bitnamilegacy/kubectl:1.29"
5454
helm: "ghcr.io/cloudogu/helm:3.15.4-1"
5555
kubeval: "ghcr.io/cloudogu/helm:3.15.4-1"
5656
helmKubeval: "ghcr.io/cloudogu/helm:3.15.4-1"

0 commit comments

Comments
 (0)