Skip to content

fix(deps): bump io.javaoperatorsdk:operator-framework from 5.0.1 to 5.0.3 #637

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.

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

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/cve-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Checkout code
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Set up JDK 17
- name: Set up JDK
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
with:
distribution: 'temurin'
Expand Down Expand Up @@ -144,7 +144,7 @@ jobs:

- name: Upload CVE files
if: failure()
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
with:
name: cves
path: cve_slack_payload_*.json
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/java-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
./gradlew jibDockerBuild &&
docker run --rm --entrypoint="echo" mongodb-operator:latest 'image is not distroless' && exit 1 || echo 'image is distroless'

- uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
- uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
if: always()
with:
name: java-ci-test-results
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/license-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Checkout code
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Set up JDK 21
- name: Set up JDK
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
with:
distribution: 'temurin'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
run: mkdocs build --config-file mkdocs.yml && ls -al
- name: Archive test build
if: github.event_name == 'pull_request'
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
with:
name: site
path: |
Expand Down
22 changes: 11 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ java {
vendor = JvmVendorSpec.ADOPTIUM
}
}
tasks.withType(JavaCompile) {
tasks.withType(JavaCompile).configureEach {
options.encoding = 'UTF-8'
}

Expand All @@ -50,16 +50,19 @@ jib {

project.ext {
mongoDbDriverVersion = "5.3.1"
slf4jVersion = "2.0.16"
operatorFrameworkVersion = "5.0.1"
slf4jVersion = "2.0.17"
operatorFrameworkVersion = "5.0.3"
kubernetesServerMockVersion = "7.1.0" // align with transitive dependency of operator framework
mockitoVersion = "5.2.0"
jacksonVersion = "2.18.2"
logbackContribVersion = "0.1.5"
nettyVersion = "4.1.119.Final"
}

dependencies {

implementation enforcedPlatform("io.netty:netty-bom:${nettyVersion}")
annotationProcessor enforcedPlatform("io.netty:netty-bom:${nettyVersion}")
implementation enforcedPlatform("com.fasterxml.jackson:jackson-bom:${jacksonVersion}")
annotationProcessor enforcedPlatform("com.fasterxml.jackson:jackson-bom:${jacksonVersion}")
implementation enforcedPlatform('org.eclipse.jetty:jetty-bom:11.0.24')
Expand All @@ -69,10 +72,7 @@ dependencies {
exclude group: "org.slf4j"
// recheck when operator-framework is upgraded
exclude group: 'com.squareup.okio', module: 'okio'
// vulnerability in 4.1.117.Final, may be removed when netty is updated in operator framework
exclude group: 'io.netty', module: 'netty-common'
}
implementation 'io.netty:netty-common:4.1.118.Final'
annotationProcessor "io.javaoperatorsdk:operator-framework:${operatorFrameworkVersion}", {
// self managed to avoid conflicts
exclude group: "org.slf4j"
Expand All @@ -97,7 +97,7 @@ dependencies {
// logging
annotationProcessor "org.slf4j:slf4j-api:${slf4jVersion}"
implementation "org.slf4j:slf4j-api:${slf4jVersion}"
implementation 'ch.qos.logback:logback-classic:1.5.16', {
implementation 'ch.qos.logback:logback-classic:1.5.17', {
exclude group: "org.slf4j", module: "slf4j-api"
}
implementation "ch.qos.logback.contrib:logback-json-classic:${logbackContribVersion}", {
Expand All @@ -111,7 +111,7 @@ dependencies {
implementation 'io.micrometer:micrometer-registry-prometheus:1.14.4'

// test
testImplementation enforcedPlatform("org.junit:junit-bom:5.11.4")
testImplementation enforcedPlatform("org.junit:junit-bom:5.12.0")
testImplementation 'org.junit.jupiter:junit-jupiter'
testImplementation 'org.junit-pioneer:junit-pioneer:2.3.0'
testImplementation 'org.assertj:assertj-core:3.27.3', {
Expand All @@ -137,20 +137,20 @@ dependencies {
exclude group: 'net.bytebuddy', 'module': 'byte-buddy'
exclude group: 'net.bytebuddy', 'module': 'byte-buddy-agent'
}
testImplementation 'org.awaitility:awaitility:4.2.2'
testImplementation 'org.awaitility:awaitility:4.3.0'
testImplementation "io.fabric8:kubernetes-server-mock:${kubernetesServerMockVersion}", {
// self managed to avoid conflicts
exclude group: "org.slf4j"
exclude group: 'com.squareup.okio', module: 'okio'
exclude group: 'junit', module: 'junit'
// vulnerability in 4.1.117.Final
exclude group: 'io.netty', module: 'netty-common'
}
// CVE-2020-15250 in 4.12
// -> pulled transitively from OkHttp3 mockwebserver used by kubernetes-server-mock
testImplementation 'junit:junit:4.13.2'
testImplementation 'com.squareup.okhttp3:okhttp:3.12.12', {
testImplementation 'com.squareup.okhttp3:okhttp:4.12.0', {
exclude group: 'com.squareup.okio', module: 'okio'
exclude group: "org.jetbrains.kotlin", module: "kotlin-stdlib-jdk8"
}
}

Expand Down
34 changes: 34 additions & 0 deletions kustomize/release/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,37 @@ namespace: mongodb-operator
resources:
- mongodb-operator-ns.yaml
- no-namespace
images:
- name: quay.io/sdase/mongodb-operator
newName: mongodb-operator
newTag: local-2

secretGenerator:
- name: mongodb-operator
literals:
- mongodbConnectionString=mongodb://test-root:test-s3cr3t@mongodb.mongodb

patches:
- target:
kind: Deployment
name: mongodb-operator
patch: |
- op: replace
path: /spec/template/spec/containers/0/imagePullPolicy
value: IfNotPresent
- target:
name: mongodb-operator
kind: Deployment
patch: |
apiVersion: apps/v1
kind: Deployment
metadata:
name: mongodb-operator
spec:
template:
spec:
containers:
- name: operator
env:
- name: ENABLE_JSON_LOGGING
value: "false"
Loading