Skip to content

[EXPERIMENT] - exp work #45

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

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

[EXPERIMENT] - exp work #45

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
a6ec161
exp work
briandowns Jan 22, 2025
45d83b8
update
briandowns Jan 22, 2025
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
6 changes: 1 addition & 5 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ jobs:
uses: rancher-eio/read-vault-secrets@main
with:
secrets: |
secret/data/github/repo/${{ github.repository }}/dockerhub/${{ github.repository_owner }}/credentials username | DOCKER_USERNAME ;
secret/data/github/repo/${{ github.repository }}/dockerhub/${{ github.repository_owner }}/credentials password | DOCKER_PASSWORD ;
secret/data/github/repo/${{ github.repository }}/rancher-prime-registry/credentials registry | PRIME_REGISTRY ;
secret/data/github/repo/${{ github.repository }}/rancher-prime-registry/credentials username | PRIME_REGISTRY_USERNAME ;
secret/data/github/repo/${{ github.repository }}/rancher-prime-registry/credentials password | PRIME_REGISTRY_PASSWORD
Expand All @@ -34,9 +32,7 @@ jobs:
image: hardened-etcd
tag: ${{ github.event.release.tag_name }}

public-repo: rancher
public-username: ${{ env.DOCKER_USERNAME }}
public-password: ${{ env.DOCKER_PASSWORD }}
push-to-public: false

prime-repo: rancher
prime-registry: ${{ env.PRIME_REGISTRY }}
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ FROM base-builder as etcd-builder
# setup the build
ARG TARGETARCH
ARG PKG=go.etcd.io/etcd
ARG SRC=github.com/k3s-io/etcd
ARG TAG="v3.5.13-k3s1"
ARG SRC=github.com/rancher/etcd-exp
ARG TAG="v3.5.13-k3s1-exp1"
RUN git clone --depth=1 https://${SRC}.git $GOPATH/src/${PKG}
WORKDIR $GOPATH/src/${PKG}
RUN git fetch --all --tags --prune
Expand Down
8 changes: 2 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ endif

BUILD_META=-build$(shell date +%Y%m%d)
PKG ?= go.etcd.io/etcd
SRC ?= github.com/k3s-io/etcd
SRC ?= github.com/rancher/etcd-exp
TAG ?= ${GITHUB_ACTION_TAG}

ifeq ($(TAG),)
Expand All @@ -36,11 +36,7 @@ BUILD_OPTS = \

.PHONY: image-build
image-build:
docker buildx build \
$(BUILD_OPTS) \
--pull \
--load \
.
docker buildx build $(BUILD_OPTS) --pull --load .

.PHONY: push-image
push-image:
Expand Down
Loading