Skip to content
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

Jump to bottom

Update operator-framework and crd-generator #130

Merged
merged 1 commit into from
Jun 4, 2024
Merged

Update operator-framework and crd-generator #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,18 @@ dependencies {
// developmentOnly 'org.springframework.boot:spring-boot-devtools:3.2.0'
implementation 'org.springframework.boot:spring-boot-starter-actuator:3.3.0'
implementation 'org.springframework.boot:spring-boot-starter-web:3.3.0'
implementation 'io.javaoperatorsdk:operator-framework-spring-boot-starter:5.4.1'
implementation 'io.javaoperatorsdk:operator-framework-spring-boot-starter:5.5.0'
implementation 'org.bouncycastle:bcpkix-jdk15on:1.70'
// required for the fabric8 k8s client to grok k3d certificates
annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor:3.3.0'
compileOnly 'org.projectlombok:lombok'
testCompileOnly 'org.projectlombok:lombok'
annotationProcessor 'org.projectlombok:lombok'
annotationProcessor 'io.fabric8:crd-generator-apt:6.9.2'
annotationProcessor 'io.fabric8:crd-generator-apt:6.13.0'
testImplementation 'org.junit.jupiter:junit-jupiter:5.9.2'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
testImplementation 'org.springframework.boot:spring-boot-starter-test:3.3.0'
testImplementation 'io.javaoperatorsdk:operator-framework-spring-boot-starter-test:5.4.1'
testImplementation 'io.javaoperatorsdk:operator-framework-spring-boot-starter-test:5.5.0'
}

tasks.named('test') {
Expand Down
28 changes: 28 additions & 0 deletions charts/cmcc-operator/templates/crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,13 @@ spec:
podSecurityContext:
description: Security context for a pod
properties:
appArmorProfile:
properties:
localhostProfile:
type: string
type:
type: string
type: object
fsGroup:
type: integer
fsGroupChangePolicy:
Expand Down Expand Up @@ -253,6 +260,13 @@ spec:
properties:
allowPrivilegeEscalation:
type: boolean
appArmorProfile:
properties:
localhostProfile:
type: string
type:
type: string
type: object
capabilities:
properties:
add:
Expand Down Expand Up @@ -398,6 +412,13 @@ spec:
podSecurityContext:
description: Default security context for a pod
properties:
appArmorProfile:
properties:
localhostProfile:
type: string
type:
type: string
type: object
fsGroup:
type: integer
fsGroupChangePolicy:
Expand Down Expand Up @@ -474,6 +495,13 @@ spec:
properties:
allowPrivilegeEscalation:
type: boolean
appArmorProfile:
properties:
localhostProfile:
type: string
type:
type: string
type: object
capabilities:
properties:
add:
Expand Down
28 changes: 28 additions & 0 deletions k8s/cmcc-crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,13 @@ spec:
podSecurityContext:
description: Security context for a pod
properties:
appArmorProfile:
properties:
localhostProfile:
type: string
type:
type: string
type: object
fsGroup:
type: integer
fsGroupChangePolicy:
Expand Down Expand Up @@ -252,6 +259,13 @@ spec:
properties:
allowPrivilegeEscalation:
type: boolean
appArmorProfile:
properties:
localhostProfile:
type: string
type:
type: string
type: object
capabilities:
properties:
add:
Expand Down Expand Up @@ -397,6 +411,13 @@ spec:
podSecurityContext:
description: Default security context for a pod
properties:
appArmorProfile:
properties:
localhostProfile:
type: string
type:
type: string
type: object
fsGroup:
type: integer
fsGroupChangePolicy:
Expand Down Expand Up @@ -473,6 +494,13 @@ spec:
properties:
allowPrivilegeEscalation:
type: boolean
appArmorProfile:
properties:
localhostProfile:
type: string
type:
type: string
type: object
capabilities:
properties:
add:
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/tsystemsmms/cmcc/cmccoperator/components/AbstractComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ public PersistentVolumeClaim getPersistentVolumeClaim(String name, Quantity size
.withMetadata(getResourceMetadataForName(name))
.withSpec(new PersistentVolumeClaimSpecBuilder()
.withAccessModes("ReadWriteOnce")
.withResources(new ResourceRequirementsBuilder()
.withResources(new VolumeResourceRequirementsBuilder()
.withRequests(Map.of("storage", size))
.build())
.withStorageClassName(sc)
Expand Down
Loading