Skip to content

Commit 3726f55

Browse files
committed
improvements
1 parent 3437574 commit 3726f55

15 files changed

+20
-21
lines changed

.github/scripts/.bash_history

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ rm -rf jdk-18_linux-x64_bin.deb
347347
git rebase -i main
348348
git rebase -i master
349349
git stash
350-
export tempPassword="OeyxzcLdUbln0KxnhlQaT2wQKfpJpV/A7/ach+erH4M="
350+
export tempPassword="mVskm4vj9tBf4BqqQEyPaFtTAFJ+K9csVbQkwF3Kj04="
351351
mvn run tempPassword
352352
k6
353353
npx k6

Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM bellsoft/liberica-openjre-debian:25-cds AS builder
22
WORKDIR /builder
33

4-
ARG argBasedVersion="1.13.1-alpha5"
4+
ARG argBasedVersion="1.13.1-alpha6"
55

66
COPY --chown=wrongsecrets target/wrongsecrets-${argBasedVersion}-SNAPSHOT.jar application.jar
77
RUN java -Djarmode=tools -jar application.jar extract --layers --destination extracted
@@ -59,7 +59,7 @@ RUN mkdir -p /var/run/secrets/kubernetes.io/serviceaccount && \
5959
chmod 600 /var/run/secrets/kubernetes.io/serviceaccount/token
6060

6161
# Create a dynamic archive
62-
RUN java --add-modules=jdk.unsupported -XX:ArchiveClassesAtExit=application.jsa -Dspring.context.exit=onRefresh -jar application.jar
62+
RUN java -XX:ArchiveClassesAtExit=application.jsa -Dspring.context.exit=onRefresh -jar application.jar
6363

6464
# Clean up the mocked token
6565
RUN rm -rf /var/run/secrets/kubernetes.io
@@ -71,5 +71,4 @@ RUN rm -rf /var/run/secrets/kubernetes.io
7171
RUN adduser -u 2000 -D wrongsecrets
7272
USER wrongsecrets
7373

74-
CMD ["java", "-Xms128m", "-Xmx128m", "-Xss512k", "-jar", "-Dserver.port=$PORT", "-XX:MaxRAMPercentage=75", "-XX:MinRAMPercentage=25", "-Dspring.profiles.active=without-vault", "-Dspringdoc.swagger-ui.enabled=${SPRINGDOC_UI}", "-Dspringdoc.api-docs.enabled=${SPRINGDOC_DOC}", "application.jar"]
75-
# CMD java -jar -XX:SharedArchiveFile=application.jsa -Dspring.profiles.active=$(echo ${SPRING_PROFILES_ACTIVE}) -Dspringdoc.swagger-ui.enabled=${SPRINGDOC_UI} -Dspringdoc.api-docs.enabled=${SPRINGDOC_DOC} -D application.jar
74+
CMD java -jar -XX:SharedArchiveFile=application.jsa -Dspring.profiles.active=$(echo ${SPRING_PROFILES_ACTIVE}) -Dspringdoc.swagger-ui.enabled=${SPRINGDOC_UI} -Dspringdoc.api-docs.enabled=${SPRINGDOC_DOC} -D application.jar

aws/k8s/secret-challenge-vault-deployment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ spec:
5858
volumeAttributes:
5959
secretProviderClass: "wrongsecrets-aws-secretsmanager"
6060
containers:
61-
- image: jeroenwillemsen/wrongsecrets:1.13.1-alpha5-k8s-vault
61+
- image: jeroenwillemsen/wrongsecrets:1.13.1-alpha6-k8s-vault
6262
imagePullPolicy: IfNotPresent
6363
name: secret-challenge
6464
command: ["/bin/sh"]

azure/k8s/secret-challenge-vault-deployment.yml.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ spec:
6161
volumeAttributes:
6262
secretProviderClass: "azure-wrongsecrets-vault"
6363
containers:
64-
- image: jeroenwillemsen/wrongsecrets:1.13.1-alpha5-k8s-vault
64+
- image: jeroenwillemsen/wrongsecrets:1.13.1-alpha6-k8s-vault
6565
imagePullPolicy: IfNotPresent
6666
name: secret-challenge
6767
command: ["/bin/sh"]

docs/VERSION_MANAGEMENT.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ The project maintains version consistency between:
1212
## Version Schema
1313

1414
```
15-
pom.xml version: 1.13.1-alpha5-SNAPSHOT
16-
Dockerfile version: 1.13.1-alpha5
17-
Dockerfile.web version: 1.13.1-alpha5-no-vault
15+
pom.xml version: 1.13.1-alpha6-SNAPSHOT
16+
Dockerfile version: 1.13.1-alpha6
17+
Dockerfile.web version: 1.13.1-alpha6-no-vault
1818
```
1919

2020
## Automated Solutions

fly.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ app = "wrongsecrets"
88
primary_region = "ams"
99

1010
[build]
11-
image = "docker.io/jeroenwillemsen/wrongsecrets:1.13.1-alpha5-no-vault"
11+
image = "docker.io/jeroenwillemsen/wrongsecrets:1.13.1-alpha6-no-vault"
1212

1313
[env]
1414
K8S_ENV = "Fly(Docker)"

gcp/k8s/secret-challenge-vault-deployment.yml.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ spec:
5858
volumeAttributes:
5959
secretProviderClass: "wrongsecrets-gcp-secretsmanager"
6060
containers:
61-
- image: jeroenwillemsen/wrongsecrets:1.13.1-alpha5-k8s-vault
61+
- image: jeroenwillemsen/wrongsecrets:1.13.1-alpha6-k8s-vault
6262
imagePullPolicy: IfNotPresent
6363
name: secret-challenge
6464
command: ["/bin/sh"]

js/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

22
function secret() {
3-
var password = "t5K69iQ=" + 9 + "IoOL" + 6 + "jYE=" + 2 + "/i5I" + 7;
3+
var password = "m2/lkfE=" + 9 + "DsPI" + 6 + "2yc=" + 2 + "BcHo" + 7;
44
return password;
55
}

k8s/challenge53/secret-challenge53-sidecar.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ spec:
2121
runAsGroup: 2000
2222
fsGroup: 2000
2323
containers:
24-
- image: jeroenwillemsen/wrongsecrets-challenge53:1.13.1-alpha5
24+
- image: jeroenwillemsen/wrongsecrets-challenge53:1.13.1-alpha6
2525
name: secret-challenge-53
2626
imagePullPolicy: IfNotPresent
2727
resources:
@@ -45,7 +45,7 @@ spec:
4545
command: ["/bin/sh", "-c"]
4646
args:
4747
- cp /home/wrongsecrets/* /shared-data/ && exec /home/wrongsecrets/start-on-arch.sh
48-
- image: jeroenwillemsen/wrongsecrets-challenge53-debug:1.13.1-alpha5
48+
- image: jeroenwillemsen/wrongsecrets-challenge53-debug:1.13.1-alpha6
4949
name: sidecar
5050
imagePullPolicy: IfNotPresent
5151
command: ["/bin/sh", "-c", "while true; do ls /shared-data; sleep 10; done"]

k8s/challenge53/secret-challenge53.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ spec:
2121
runAsGroup: 2000
2222
fsGroup: 2000
2323
containers:
24-
- image: jeroenwillemsen/wrongsecrets-challenge53:1.13.1-alpha5
24+
- image: jeroenwillemsen/wrongsecrets-challenge53:1.13.1-alpha6
2525
name: secret-challenge-53
2626
imagePullPolicy: IfNotPresent
2727
resources:

0 commit comments

Comments
 (0)