Skip to content

Commit 6df5c79

Browse files
kurtmckurtmc
committed
Add cluster-announce-ip
1 parent 808a17c commit 6df5c79

File tree

2 files changed

+46
-38
lines changed

2 files changed

+46
-38
lines changed

‎.github/workflows/image.yaml‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ jobs:
6262
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96
6363
with:
6464
images: ${{ env.REGISTRY }}/${{ github.repository_owner }}/valkey-sidecar:${{ env.RELEASE_VERSION }}
65-
- name: Extract metadata (Valkey tags, labels) for Docker
66-
id: meta_valkey
67-
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96
68-
with:
69-
images: ${{ env.REGISTRY }}/${{ github.repository_owner }}/valkey:${{ env.VALKEY_VERSION }}
65+
# - name: Extract metadata (Valkey tags, labels) for Docker
66+
# id: meta_valkey
67+
# uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96
68+
# with:
69+
# images: ${{ env.REGISTRY }}/${{ github.repository_owner }}/valkey:${{ env.VALKEY_VERSION }}
7070

7171
- name: Setup Go ${{ matrix.go-version }}
7272
uses: actions/setup-go@v5
@@ -101,16 +101,16 @@ jobs:
101101
platforms: ${{ matrix.platform }}
102102
labels: ${{ steps.meta_sidecar.outputs.labels }}
103103
outputs: type=image,"name=${{ env.REGISTRY }}/${{ github.repository_owner }}/valkey-sidecar",push-by-digest=true,name-canonical=true,push=true
104-
- name: Build and push Valkey image
105-
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991
106-
id: docker_build_valkey
107-
with:
108-
file: Dockerfile.valkey
109-
context: .
110-
visibility: public
111-
platforms: ${{ matrix.platform }}
112-
labels: ${{ steps.meta_valkey.outputs.labels }}
113-
outputs: type=image,"name=${{ env.REGISTRY }}/${{ github.repository_owner }}/valkey",push-by-digest=true,name-canonical=true,push=true
104+
# - name: Build and push Valkey image
105+
# uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991
106+
# id: docker_build_valkey
107+
# with:
108+
# file: Dockerfile.valkey
109+
# context: .
110+
# visibility: public
111+
# platforms: ${{ matrix.platform }}
112+
# labels: ${{ steps.meta_valkey.outputs.labels }}
113+
# outputs: type=image,"name=${{ env.REGISTRY }}/${{ github.repository_owner }}/valkey",push-by-digest=true,name-canonical=true,push=true
114114

115115
- name: Set up Cosign
116116
uses: sigstore/cosign-installer@d7d6bc7722e3daa8354c50bcb52f4837da5e9b6a # v3.8.1
@@ -121,9 +121,9 @@ jobs:
121121
- name: Sign Sidecar image with GitHub OIDC Token
122122
run: |
123123
cosign sign --yes ${{ env.REGISTRY }}/${{ github.repository_owner }}/valkey-sidecar:${{ env.RELEASE_VERSION }}@${{ steps.docker_build_sidecar.outputs.digest }}
124-
- name: Sign Valkey image with GitHub OIDC Token
125-
run: |
126-
cosign sign --yes ${{ env.REGISTRY }}/${{ github.repository_owner }}/valkey:${{ env.VALKEY_VERSION }}@${{ steps.docker_build_valkey.outputs.digest }}
124+
# - name: Sign Valkey image with GitHub OIDC Token
125+
# run: |
126+
# cosign sign --yes ${{ env.REGISTRY }}/${{ github.repository_owner }}/valkey:${{ env.VALKEY_VERSION }}@${{ steps.docker_build_valkey.outputs.digest }}
127127

128128
- name: Attest the Controller image
129129
uses: actions/attest-build-provenance@v2
@@ -139,24 +139,24 @@ jobs:
139139
subject-name: ${{ env.REGISTRY }}/${{ github.repository_owner }}/valkey-sidecar
140140
subject-digest: ${{ steps.docker_build_sidecar.outputs.digest }}
141141
push-to-registry: true
142-
- name: Attest the Valkey image
143-
uses: actions/attest-build-provenance@v2
144-
id: attest_valkey
145-
with:
146-
subject-name: ${{ env.REGISTRY }}/${{ github.repository_owner }}/valkey
147-
subject-digest: ${{ steps.docker_build_valkey.outputs.digest }}
148-
push-to-registry: true
142+
# - name: Attest the Valkey image
143+
# uses: actions/attest-build-provenance@v2
144+
# id: attest_valkey
145+
# with:
146+
# subject-name: ${{ env.REGISTRY }}/${{ github.repository_owner }}/valkey
147+
# subject-digest: ${{ steps.docker_build_valkey.outputs.digest }}
148+
# push-to-registry: true
149149
- name: Export digest
150150
run: |
151151
mkdir -p ${{ runner.temp }}/digests/controller
152152
mkdir -p ${{ runner.temp }}/digests/sidecar
153-
mkdir -p ${{ runner.temp }}/digests/valkey
153+
# mkdir -p ${{ runner.temp }}/digests/valkey
154154
digest="${{ steps.docker_build_controller.outputs.digest }}"
155155
touch "${{ runner.temp }}/digests/controller/${digest#sha256:}"
156156
digest="${{ steps.docker_build_sidecar.outputs.digest }}"
157157
touch "${{ runner.temp }}/digests/sidecar/${digest#sha256:}"
158-
digest="${{ steps.docker_build_valkey.outputs.digest }}"
159-
touch "${{ runner.temp }}/digests/valkey/${digest#sha256:}"
158+
# digest="${{ steps.docker_build_valkey.outputs.digest }}"
159+
# touch "${{ runner.temp }}/digests/valkey/${digest#sha256:}"
160160
- name: Upload digest
161161
uses: actions/upload-artifact@v4
162162
with:
@@ -215,12 +215,12 @@ jobs:
215215
cd sidecar
216216
docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
217217
$(printf '${{ env.REGISTRY }}/${{ github.repository_owner }}/valkey-sidecar@sha256:%s ' *)
218-
- name: Docker meta
219-
id: meta_valkey
220-
uses: docker/metadata-action@v5
221-
with:
222-
images: ${{ env.REGISTRY }}/${{ github.repository_owner }}/valkey
223-
tags: ${{ env.VALKEY_VERSION }}
218+
# - name: Docker meta
219+
# id: meta_valkey
220+
# uses: docker/metadata-action@v5
221+
# with:
222+
# images: ${{ env.REGISTRY }}/${{ github.repository_owner }}/valkey
223+
# tags: ${{ env.VALKEY_VERSION }}
224224
- name: Create manifest list and push
225225
working-directory: ${{ runner.temp }}/digests
226226
run: |
@@ -232,7 +232,7 @@ jobs:
232232
run: |
233233
docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.meta_controller.outputs.version }}
234234
docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ github.repository_owner }}/valkey-sidecar:${{ steps.meta_sidecar.outputs.version }}
235-
docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ github.repository_owner }}/valkey:${{ steps.meta_valkey.outputs.version }}
235+
# docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ github.repository_owner }}/valkey:${{ steps.meta_valkey.outputs.version }}
236236
237237
- name: Run Trivy vulnerability scanner
238238
uses: aquasecurity/trivy-action@master

‎internal/controller/valkey_controller.go‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2253,9 +2253,9 @@ func (r *ValkeyReconciler) upsertStatefulSet(ctx context.Context, valkey *hyperv
22532253
Name: Valkey,
22542254
ImagePullPolicy: "IfNotPresent",
22552255
Command: []string{
2256-
"valkey-server",
2257-
"/valkey/etc/valkey.conf",
2258-
"--protected-mode", "no",
2256+
"sh",
2257+
"-c",
2258+
"exec valkey-server /valkey/etc/valkey.conf --protected-mode no --cluster-announce-ip $POD_IP",
22592259
},
22602260
Env: []corev1.EnvVar{
22612261
{
@@ -2286,6 +2286,14 @@ func (r *ValkeyReconciler) upsertStatefulSet(ctx context.Context, valkey *hyperv
22862286
Name: "VALKEY_PORT_NUMBER",
22872287
Value: "6379",
22882288
},
2289+
{
2290+
Name: "POD_IP",
2291+
ValueFrom: &corev1.EnvVarSource{
2292+
FieldRef: &corev1.ObjectFieldSelector{
2293+
FieldPath: "status.podIP",
2294+
},
2295+
},
2296+
},
22892297
},
22902298
Ports: []corev1.ContainerPort{
22912299
{

0 commit comments

Comments
 (0)