Skip to content

Commit

Permalink
remove system.uri macro options
Browse files Browse the repository at this point in the history
  • Loading branch information
santhoshdaivajna committed Dec 18, 2023
1 parent edf50bb commit bd57451
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
3 changes: 2 additions & 1 deletion .arg.template
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ ARCH=amd64
HTTPS_PROXY=
HTTP_PROXY=
PROXY_CERT_PATH=
UPDATE_KERNEL=false
UPDATE_KERNEL=false
K8S_VERSION=v1.27.2
4 changes: 4 additions & 0 deletions Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ ARG SPECTRO_LUET_VERSION=v1.2.0
ARG KAIROS_VERSION=v2.4.3
ARG K3S_FLAVOR_TAG=k3s1
ARG RKE2_FLAVOR_TAG=rke2r1
ARG K8S_VERSION=v1.27.5
ARG BASE_IMAGE_URL=quay.io/kairos
ARG OSBUILDER_VERSION=v0.7.11
ARG OSBUILDER_IMAGE=quay.io/kairos/osbuilder-tools:$OSBUILDER_VERSION
Expand Down Expand Up @@ -77,6 +78,9 @@ build-provider-images:
BUILD +provider-image --K8S_VERSION=1.28.2


build-provider-image:
ARG K8S_VERSION
BUILD +provider-image --K8S_VERSION=$K8S_VERSION

build-provider-images-fips:
IF [ "$K8S_DISTRIBUTION" = "kubeadm-fips" ]
Expand Down
10 changes: 2 additions & 8 deletions earthly.sh
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,6 @@ echo -e ' #force: true # Continue even if there are pods that do not declare
echo -e ' #disableEviction: false # Force drain to use delete, even if eviction is supported. This will bypass checking PodDisruptionBudgets, use with caution'
echo -e ' #skipWaitForDeleteTimeout: 60 # If pod DeletionTimestamp older than N seconds, skip waiting for the pod. Seconds must be greater than 0 to skip.'
echo -e 'options:'
echo -e ' system.uri: "{{ .spectro.pack.edge-native-byoi.options.system.registry }}/{{ .spectro.pack.edge-native-byoi.options.system.repo }}:{{ .spectro.pack.edge-native-byoi.options.system.k8sDistribution }}-{{ .spectro.system.kubernetes.version }}-{{ .spectro.pack.edge-native-byoi.options.system.peVersion }}-{{ .spectro.pack.edge-native-byoi.options.system.customTag }}"'
echo -e ' system.uri: "$IMAGE_REGISTRY/$IMAGE_REPO:$K8S_DISTRIBUTION-$K8S_VERSION-$PE_VERSION-$CUSTOM_TAG"'
echo -e '\n'
echo -e " system.registry: $IMAGE_REGISTRY"
echo -e " system.repo: $IMAGE_REPO"
echo -e " system.k8sDistribution: $K8S_DISTRIBUTION"
echo -e " system.osName: $OS_DISTRIBUTION"
echo -e " system.peVersion: $PE_VERSION"
echo -e " system.customTag: $CUSTOM_TAG"
echo -e " system.osVersion: $OS_VERSION"

0 comments on commit bd57451

Please sign in to comment.