Skip to content

Commit

Permalink
update components image namespace
Browse files Browse the repository at this point in the history
Signed-off-by: pixiake <guofeng@yunify.com>
  • Loading branch information
pixiake committed Jul 20, 2023
1 parent 435b110 commit 2e48010
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
18 changes: 9 additions & 9 deletions roles/download/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ ks_version: >-
{%- endif %}
#KubeSphere:
ks_apiserver_repo: "{{ base_repo }}{{ namespace_override | default('kubespheredev') }}/ks-apiserver"
ks_apiserver_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/ks-apiserver"
ks_apiserver_tag: "{{ ks_version }}"
ks_controller_manager_repo: "{{ base_repo }}{{ namespace_override | default('kubespheredev') }}/ks-controller-manager"
ks_controller_manager_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/ks-controller-manager"
ks_controller_manager_tag: "{{ ks_version }}"
ks_update_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/ks-upgrade"
ks_update_tag: v3.0.0
ks_alerting_migration_repo: "{{ base_repo }}{{ namespace_override | default('kubespheredev') }}/ks-alerting-migration"
ks_alerting_migration_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/ks-alerting-migration"
ks_alerting_migration_tag: "v3.1.0"
ks_console_repo: "{{ base_repo }}{{ namespace_override | default('kubespheredev') }}/ks-console"
ks_console_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/ks-console"
ks_console_tag: "{{ ks_version }}"
ks_kubectl_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/kubectl"
ks_kubectl_tag: v1.22.0
Expand All @@ -73,7 +73,7 @@ ks_kubectl_versions:
v1.16.0: v1.16.0
v1.15.0: v1.0.0

ks_installer_repo: "{{ base_repo }}{{ namespace_override | default('kubespheredev') }}/ks-installer"
ks_installer_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/ks-installer"
ks_installer_tag: "{{ ks_version }}"

ks_image_pull_policy: Always
Expand Down Expand Up @@ -115,18 +115,18 @@ snapshot_controller_repo: "{{ base_repo }}{{ namespace_override | default('csipl
snapshot_controller_tag: "v4.0.0"

# ks-devops
ks_devops_registry: "{{ base_repo }}{{ namespace_override | default('kubespheredev') }}"
ks_devops_registry: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}"
ks_devops_controller_tag: "ks-{{ ks_version }}"
ks_devops_apiserver_tag: "ks-{{ ks_version }}"
ks_devops_tools_tag: "ks-{{ ks_version }}"

#jenkins:
jenkins_repo: "{{ base_repo }}{{ namespace_override | default('kubespheredev') }}/ks-jenkins"
jenkins_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/ks-jenkins"
jenkins_tag: v3.4.0-2.319.3-1
jnlp_slave_repo: "{{ base_repo }}{{ namespace_override | default('jenkins') }}/inbound-agent"
jnlp_slave_tag: 4.10-2

builder_registry: "{{ base_repo }}{{ namespace_override | default('kubespheredev') }}"
builder_registry: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}"
builder_base_tag: v3.2.2
builder_nodejs_tag: v3.2.0
builder_maven_tag: v3.2.0
Expand All @@ -148,7 +148,7 @@ builder_go17_podman_tag: v3.2.2-1.17-podman
builder_go18_podman_tag: v3.2.2-1.18-podman

#s2i
s2i_registry: "{{ base_repo }}{{ namespace_override | default('kubespheredev') }}"
s2i_registry: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}"
s2ioperator_tag: "v3.2.1"
s2irun_tag: "v3.2.0"
s2itemplates_tag: "v3.2.0"
Expand Down
8 changes: 4 additions & 4 deletions scripts/build/Dockerfile.tools
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM ubuntu:20.04
FROM ubuntu:22.04

ENV VERSION_ID=20.04
ENV VERSION_ID=22.04
RUN apt update && apt install curl gnupg -y && \
echo "deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${VERSION_ID}/ /" | tee /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list && \
curl -L https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${VERSION_ID}/Release.key | apt-key add - && \
echo "deb http://download.opensuse.org/repositories/home:/alvistack/xUbuntu_${VERSION_ID}/ /" | tee /etc/apt/sources.list.d/home:alvistack.list && \
curl -L https://download.opensuse.org/repositories/home:alvistack/xUbuntu_${VERSION_ID}/Release.key | apt-key add - && \
apt update && \
apt -y install skopeo

Expand Down

0 comments on commit 2e48010

Please sign in to comment.