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.

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

mirrored pause update #4829

Merged
merged 2 commits into from
Oct 3, 2023
Merged

mirrored pause update #4829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0cc564
mirrored pause update
briandowns Oct 3, 2023
3306ab3
appease codespell
briandowns Oct 3, 2023
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 Vagrantfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ EOF
# SELinux is Enforcing by default.
# To set SELinux as Disabled on a VM that has already been provisioned:
# SELINUX=Disabled vagrant up --provision-with=selinux
# To set SELinux as Permissive on a VM that has already been provsioned
# To set SELinux as Permissive on a VM that has already been provisioned
# SELINUX=Permissive vagrant up --provision-with=selinux
config.vm.provision "selinux", type: "shell", run: "once" do |sh|
sh.upload_path = "/tmp/vagrant-selinux"
Expand Down
2 changes: 1 addition & 1 deletion developer-docs/updating_rke2_charts.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ xargs -n1 -t docker image pull --quiet << EOF >> build/images-core.txt
${REGISTRY}/rancher/hardened-etcd:${ETCD_VERSION}-build20220413
${REGISTRY}/rancher/hardened-k8s-metrics-server:v0.5.0-build20210915
${REGISTRY}/rancher/klipper-helm:v0.6.1-build20210616
${REGISTRY}/rancher/pause:${PAUSE_VERSION}
${REGISTRY}/rancher/mirrored-pause:${PAUSE_VERSION}
${REGISTRY}/rancher/mirrored-jettech-kube-webhook-certgen:v1.5.1
${REGISTRY}/rancher/nginx-ingress-controller:nginx-0.47.0-hardened1
${REGISTRY}/rancher/rke2-cloud-provider:${CCM_VERSION}
Expand Down
2 changes: 1 addition & 1 deletion pkg/images/images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ var (
DefaultRegistry = name.DefaultRegistry
DefaultEtcdImage = "rancher/hardened-etcd"
DefaultKubernetesImage = "rancher/hardened-kubernetes"
DefaultPauseImage = "rancher/pause"
DefaultPauseImage = "rancher/mirrored-pause"
DefaultRuntimeImage = "rancher/rke2-runtime"
DefaultCloudControllerManagerImage = "rancher/rke2-cloud-provider"
)
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-windows-binary
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ VERSION_FLAGS="
-X ${RKE2_PKG}/pkg/images.DefaultRegistry=${REGISTRY}
-X ${RKE2_PKG}/pkg/images.DefaultEtcdImage=rancher/hardened-etcd:${ETCD_VERSION}-build20230802
-X ${RKE2_PKG}/pkg/images.DefaultKubernetesImage=${REPO}/hardened-kubernetes:${KUBERNETES_IMAGE_TAG}
-X ${RKE2_PKG}/pkg/images.DefaultPauseImage=rancher/pause:${PAUSE_VERSION}
-X ${RKE2_PKG}/pkg/images.DefaultPauseImage=rancher/mirrored-pause:${PAUSE_VERSION}
-X ${RKE2_PKG}/pkg/images.DefaultRuntimeImage=${REPO}/${PROG}-runtime:${DOCKERIZED_VERSION}-${GOOS}-${GOARCH}
"

Expand Down
Loading