Skip to content
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.

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

Aligns container registry to v4.5 #951

Merged
merged 1 commit into from
Aug 5, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion adoc/admin-centralized-logging.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ Options with empty default values are set as not specified.
|===
|Parameter |Function |Default value

| image.repository |specifies image repository to pull from|registry.suse.com/caasp/v5/rsyslog
| image.repository |specifies image repository to pull from|registry.suse.com/caasp/v4.5/rsyslog
|image.tag|specifies image tag to pull|8.39.0
|kubernetesPodAnnotationsEnabled|enables kubernetes meta annotations in pod logs|false
|kubernetesPodLabelsEnabled|enables kubernetes meta labels in pod logs| false
Expand Down
4 changes: 2 additions & 2 deletions adoc/admin-security-ldap.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Directory Server" (389-ds) and "Active Directory" by updating the built-in Dex L

== Deploying an External 389 Directory Server

The 389 Directory Server image `registry.suse.com/caasp/v5/389-ds:1.4.3`
The 389 Directory Server image `registry.suse.com/caasp/v4.5/389-ds:1.4.3`
will *automatically generate a self-signed certificate* and key.
The following instructions show how to deploy the "389 Directory Server"
with a customized configuration using container commands.
Expand All @@ -30,7 +30,7 @@ docker run -d \
-e DS_DM_PASSWORD=<DS_DM_PASSWORD> \
-e DS_SUFFIX=<DS_SUFFIX> \
-v <DATA_DIR>:/data \
--name 389-ds registry.suse.com/caasp/v5/389-ds:1.4.3
--name 389-ds registry.suse.com/caasp/v4.5/389-ds:1.4.3
----

== Deploying a 389 Directory Server with an External Certificate
Expand Down
4 changes: 2 additions & 2 deletions adoc/admin-software-installation.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ kubectl create clusterrolebinding tiller \
--serviceaccount=kube-system:tiller

helm init \
--tiller-image registry.suse.com/caasp/v5/helm-tiller:{helm_tiller_version} \
--tiller-image registry.suse.com/caasp/v4.5/helm-tiller:{helm_tiller_version} \
--service-account tiller
----

Expand Down Expand Up @@ -178,7 +178,7 @@ helm init \
--tiller-tls-cert tiller.crt \
--tiller-tls-key tiller.key \
--tls-ca-cert ca.crt \
--tiller-image registry.suse.com/caasp/v5/helm-tiller:{helm_tiller_version} \
--tiller-image registry.suse.com/caasp/v4.5/helm-tiller:{helm_tiller_version} \
--service-account tiller
----

Expand Down
30 changes: 15 additions & 15 deletions adoc/admin-velero-deployment.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ helm install \
--set configuration.backupStorageLocation.config.region=<REGION_NAME> \
--set snapshotsEnabled=false \
--set initContainers[0].name=velero-plugin-for-aws \
--set initContainers[0].image=registry.suse.com/caasp/v5/velero-plugin-for-aws:1.0.1 \
--set initContainers[0].image=registry.suse.com/caasp/v4.5/velero-plugin-for-aws:1.0.1 \
--set initContainers[0].volumeMounts[0].mountPath=/target \
--set initContainers[0].volumeMounts[0].name=plugins \
suse/velero
Expand All @@ -57,7 +57,7 @@ helm install velero \
--set configuration.backupStorageLocation.config.region=<REGION_NAME> \
--set snapshotsEnabled=false \
--set initContainers[0].name=velero-plugin-for-aws \
--set initContainers[0].image=registry.suse.com/caasp/v5/velero-plugin-for-aws:1.0.1 \
--set initContainers[0].image=registry.suse.com/caasp/v4.5/velero-plugin-for-aws:1.0.1 \
--set initContainers[0].volumeMounts[0].mountPath=/target \
--set initContainers[0].volumeMounts[0].name=plugins \
suse/velero
Expand Down Expand Up @@ -88,7 +88,7 @@ helm install \
--set configuration.backupStorageLocation.bucket=<BUCKET_NAME> \
--set snapshotsEnabled=false \
--set initContainers[0].name=velero-plugin-for-gcp \
--set initContainers[0].image=registry.suse.com/caasp/v5/velero-plugin-for-gcp:1.0.1 \
--set initContainers[0].image=registry.suse.com/caasp/v4.5/velero-plugin-for-gcp:1.0.1 \
--set initContainers[0].volumeMounts[0].mountPath=/target \
--set initContainers[0].volumeMounts[0].name=plugins \
suse/velero
Expand All @@ -106,7 +106,7 @@ helm install velero \
--set configuration.backupStorageLocation.bucket=<BUCKET_NAME> \
--set snapshotsEnabled=false \
--set initContainers[0].name=velero-plugin-for-gcp \
--set initContainers[0].image=registry.suse.com/caasp/v5/velero-plugin-for-gcp:1.0.1 \
--set initContainers[0].image=registry.suse.com/caasp/v4.5/velero-plugin-for-gcp:1.0.1 \
--set initContainers[0].volumeMounts[0].mountPath=/target \
--set initContainers[0].volumeMounts[0].name=plugins \
suse/velero
Expand Down Expand Up @@ -140,7 +140,7 @@ helm install \
--set configuration.backupStorageLocation.config.storageAccount=<AZURE_STORAGE_ACCOUNT_ID> \
--set snapshotsEnabled=false \
--set initContainers[0].name=velero-plugin-for-microsoft-azure \
--set initContainers[0].image=registry.suse.com/caasp/v5/velero-plugin-for-microsoft-azure:1.0.1 \
--set initContainers[0].image=registry.suse.com/caasp/v4.5/velero-plugin-for-microsoft-azure:1.0.1 \
--set initContainers[0].volumeMounts[0].mountPath=/target \
--set initContainers[0].volumeMounts[0].name=plugins \
suse/velero
Expand All @@ -160,7 +160,7 @@ helm install velero \
--set configuration.backupStorageLocation.config.storageAccount=<AZURE_STORAGE_ACCOUNT_ID> \
--set snapshotsEnabled=false \
--set initContainers[0].name=velero-plugin-for-microsoft-azure \
--set initContainers[0].image=registry.suse.com/caasp/v5/velero-plugin-for-microsoft-azure:1.0.1 \
--set initContainers[0].image=registry.suse.com/caasp/v4.5/velero-plugin-for-microsoft-azure:1.0.1 \
--set initContainers[0].volumeMounts[0].mountPath=/target \
--set initContainers[0].volumeMounts[0].name=plugins \
suse/velero
Expand Down Expand Up @@ -202,7 +202,7 @@ helm install \
--set configuration.backupStorageLocation.config.s3Url=<S3_COMPATIBLE_STORAGE_SERVER_URL> \
--set snapshotsEnabled=false \
--set initContainers[0].name=velero-plugin-for-aws \
--set initContainers[0].image=registry.suse.com/caasp/v4/velero-plugin-for-aws:1.0.1 \
--set initContainers[0].image=registry.suse.com/caasp/v4.5/velero-plugin-for-aws:1.0.1 \
--set initContainers[0].volumeMounts[0].mountPath=/target \
--set initContainers[0].volumeMounts[0].name=plugins \
suse/velero
Expand Down Expand Up @@ -254,7 +254,7 @@ helm install \
--set configuration.volumeSnapshotLocation.name=default \
--set configuration.volumeSnapshotLocation.config.region=<REGION_NAME> \
--set initContainers[0].name=velero-plugin-for-aws \
--set initContainers[0].image=registry.suse.com/caasp/v5/velero-plugin-for-aws:1.0.1 \
--set initContainers[0].image=registry.suse.com/caasp/v4.5/velero-plugin-for-aws:1.0.1 \
--set initContainers[0].volumeMounts[0].mountPath=/target \
--set initContainers[0].volumeMounts[0].name=plugins \
suse/velero
Expand All @@ -276,7 +276,7 @@ helm install velero \
--set configuration.volumeSnapshotLocation.name=default \
--set configuration.volumeSnapshotLocation.config.region=<REGION_NAME> \
--set initContainers[0].name=velero-plugin-for-aws \
--set initContainers[0].image=registry.suse.com/caasp/v5/velero-plugin-for-aws:1.0.1 \
--set initContainers[0].image=registry.suse.com/caasp/v4.5/velero-plugin-for-aws:1.0.1 \
--set initContainers[0].volumeMounts[0].mountPath=/target \
--set initContainers[0].volumeMounts[0].name=plugins \
suse/velero
Expand Down Expand Up @@ -320,7 +320,7 @@ helm install \
--set deployRestic=true \
--set configuration.volumeSnapshotLocation.name=default \
--set initContainers[0].name=velero-plugin-for-gcp \
--set initContainers[0].image=registry.suse.com/caasp/v5/velero-plugin-for-gcp:1.0.1 \
--set initContainers[0].image=registry.suse.com/caasp/v4.5/velero-plugin-for-gcp:1.0.1 \
--set initContainers[0].volumeMounts[0].mountPath=/target \
--set initContainers[0].volumeMounts[0].name=plugins \
suse/velero
Expand All @@ -340,7 +340,7 @@ helm install velero \
--set deployRestic=true \
--set configuration.volumeSnapshotLocation.name=default \
--set initContainers[0].name=velero-plugin-for-gcp \
--set initContainers[0].image=registry.suse.com/caasp/v5/velero-plugin-for-gcp:1.0.1 \
--set initContainers[0].image=registry.suse.com/caasp/v4.5/velero-plugin-for-gcp:1.0.1 \
--set initContainers[0].volumeMounts[0].mountPath=/target \
--set initContainers[0].volumeMounts[0].name=plugins \
suse/velero
Expand Down Expand Up @@ -387,7 +387,7 @@ helm install \
--set deployRestic=true \
--set configuration.volumeSnapshotLocation.name=default \
--set initContainers[0].name=velero-plugin-for-microsoft-azure \
--set initContainers[0].image=registry.suse.com/caasp/v5/velero-plugin-for-microsoft-azure:1.0.1 \
--set initContainers[0].image=registry.suse.com/caasp/v4.5/velero-plugin-for-microsoft-azure:1.0.1 \
--set initContainers[0].volumeMounts[0].mountPath=/target \
--set initContainers[0].volumeMounts[0].name=plugins \
suse/velero
Expand All @@ -409,7 +409,7 @@ helm install velero \
--set deployRestic=true \
--set configuration.volumeSnapshotLocation.name=default \
--set initContainers[0].name=velero-plugin-for-microsoft-azure \
--set initContainers[0].image=registry.suse.com/caasp/v5/velero-plugin-for-microsoft-azure:1.0.1 \
--set initContainers[0].image=registry.suse.com/caasp/v4.5/velero-plugin-for-microsoft-azure:1.0.1 \
--set initContainers[0].volumeMounts[0].mountPath=/target \
--set initContainers[0].volumeMounts[0].name=plugins \
suse/velero
Expand Down Expand Up @@ -459,7 +459,7 @@ helm install \
--set configuration.volumeSnapshotLocation.name=default \
--set configuration.volumeSnapshotLocation.config.region=<REGION_NAME> \
--set initContainers[0].name=velero-plugin-for-aws \
--set initContainers[0].image=registry.suse.com/caasp/v5/velero-plugin-for-aws:1.0.1 \
--set initContainers[0].image=registry.suse.com/caasp/v4.5/velero-plugin-for-aws:1.0.1 \
--set initContainers[0].volumeMounts[0].mountPath=/target \
--set initContainers[0].volumeMounts[0].name=plugins \
suse/velero
Expand All @@ -483,7 +483,7 @@ helm install velero \
--set configuration.volumeSnapshotLocation.name=default \
--set configuration.volumeSnapshotLocation.config.region=minio \
--set initContainers[0].name=velero-plugin-for-aws \
--set initContainers[0].image=registry.suse.com/caasp/v5/velero-plugin-for-aws:1.0.1 \
--set initContainers[0].image=registry.suse.com/caasp/v4.5/velero-plugin-for-aws:1.0.1 \
--set initContainers[0].volumeMounts[0].mountPath=/target \
--set initContainers[0].volumeMounts[0].name=plugins \
suse/velero
Expand Down
22 changes: 11 additions & 11 deletions adoc/deployment-airgapped.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -393,17 +393,17 @@ These images need to be available in the external and internal mirrors at the ti
Image tags are vary depending on your version of kubernetes you install.
:===
CATEGORY:IMAGE:URL
KUBEADM:hyperkube:registry.suse.com/caasp/v4/hyperkube
KUBEADM:pause:registry.suse.com/caasp/v4/pause
KUBEADM:coredns:registry.suse.com/caasp/v4/coredns
KUBEADM:etcd:egistry.suse.com/caasp/v4/etcd
ADDONS:cilium:registry.suse.com/caasp/v4/cilium-init
ADDONS:cilium:registry.suse.com/caasp/v4/cilium-operator
ADDONS:cilium:registry.suse.com/caasp/v4/cilium
ADDONS:dex:registry.suse.com/caasp/v4/caasp-dex
ADDONS:gangway:registry.suse.com/caasp/v4/gangway
ADDONS:kured:registry.suse.com/caasp/v4/kured
MISC:skuba-tooling:registry.suse.com/caasp/v4/skuba-tooling
KUBEADM:hyperkube:registry.suse.com/caasp/v4.5/hyperkube
KUBEADM:pause:registry.suse.com/caasp/v4.5/pause
KUBEADM:coredns:registry.suse.com/caasp/v4.5/coredns
KUBEADM:etcd:egistry.suse.com/caasp/v4.5/etcd
ADDONS:cilium:registry.suse.com/caasp/v4.5/cilium-init
ADDONS:cilium:registry.suse.com/caasp/v4.5/cilium-operator
ADDONS:cilium:registry.suse.com/caasp/v4.5/cilium
ADDONS:dex:registry.suse.com/caasp/v4.5/caasp-dex
ADDONS:gangway:registry.suse.com/caasp/v4.5/gangway
ADDONS:kured:registry.suse.com/caasp/v4.5/kured
MISC:skuba-tooling:registry.suse.com/caasp/v4.5/skuba-tooling
:===
====

Expand Down