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

chore: update to Quarkus 3.5.0 #741

Merged
merged 3 commits into from
Oct 25, 2023
Merged

chore: update to Quarkus 3.5.0 #741

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
898d43e
chore: update to Quarkus 3.5.0
metacosm Oct 19, 2023
1d5132f
fix: manually select 3.5 release version
metacosm Oct 19, 2023
ea441cc
chore: release 6.4.0.Beta1, deactivating failing tests
metacosm Oct 25, 2023
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/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ jobs:
matrix:
java-version: [ 11, 17 ]
quarkus-version-jq-cmd:
- '.platforms[0]."current-stream-id" as $current | .platforms[0].streams[] | select(.id == $current) | .releases[0].version'
# - '.platforms[0].streams[] | select(.id == "3.2") | .releases[0].version'
# - '.platforms[0]."current-stream-id" as $current | .platforms[0].streams[] | select(.id == $current) | .releases[0].version'
- '.platforms[0].streams[] | select(.id == "3.5") | .releases[0].version'
uses: ./.github/workflows/build-for-quarkus-version.yml
with:
quarkus-version-jq-cmd: ${{ matrix.quarkus-version-jq-cmd }}
Expand Down
12 changes: 6 additions & 6 deletions .../main/java/io/quarkiverse/operatorsdk/bundle/deployment/builders/CsvManifestsBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,13 +284,13 @@ public byte[] getManifestData(List<ServiceAccount> serviceAccounts, List<Cluster
return YAML_MAPPER.writeValueAsBytes(csv);
}

private void handleDeployments(List<Deployment> deployments, NamedInstallStrategyFluent.SpecNested<?> installSpec) {
private void handleDeployments(List<Deployment> deployments, NamedInstallStrategyFluent<?>.SpecNested<?> installSpec) {
deployments.forEach(deployment -> handleDeployment(deployment, installSpec));
}

private void handlePermissions(List<ClusterRole> clusterRoles, List<RoleBinding> roleBindings, List<Role> roles,
String defaultServiceAccountName,
NamedInstallStrategyFluent.SpecNested<?> installSpec) {
NamedInstallStrategyFluent<?>.SpecNested<?> installSpec) {
Map<String, List<PolicyRule>> customPermissionRules = new HashMap<>();
if (metadata.permissionRules != null) {
for (CSVMetadataHolder.PermissionRule permissionRule : metadata.permissionRules) {
Expand Down Expand Up @@ -323,7 +323,7 @@ private void handlePermissions(List<ClusterRole> clusterRoles, List<RoleBinding>
private void handleClusterPermissions(List<ClusterRoleBinding> clusterRoleBindings, List<ClusterRole> clusterRoles,
List<Role> roles,
String defaultServiceAccountName,
NamedInstallStrategyFluent.SpecNested<?> installSpec) {
NamedInstallStrategyFluent<?>.SpecNested<?> installSpec) {
for (ClusterRoleBinding binding : clusterRoleBindings) {
String serviceAccountName = findServiceAccountFromSubjects(binding.getSubjects(), defaultServiceAccountName);
if (NO_SERVICE_ACCOUNT.equals(serviceAccountName)) {
Expand All @@ -336,7 +336,7 @@ private void handleClusterPermissions(List<ClusterRoleBinding> clusterRoleBindin
}
}

private void handleDeployment(Deployment deployment, NamedInstallStrategyFluent.SpecNested<?> installSpec) {
private void handleDeployment(Deployment deployment, NamedInstallStrategyFluent<?>.SpecNested<?> installSpec) {
if (deployment != null) {
final var deploymentName = deployment.getMetadata().getName();
var deploymentSpec = deployment.getSpec();
Expand Down Expand Up @@ -375,7 +375,7 @@ private void handleDeployment(Deployment deployment, NamedInstallStrategyFluent.
}

private void handlerPermission(List<PolicyRule> rules, String serviceAccountName,
NamedInstallStrategyFluent.SpecNested<?> installSpec) {
NamedInstallStrategyFluent<?>.SpecNested<?> installSpec) {
if (!rules.isEmpty()) {
Predicate<StrategyDeploymentPermissionsBuilder> sameServiceAccountName = p -> serviceAccountName
.equals(p.getServiceAccountName());
Expand All @@ -394,7 +394,7 @@ private void handlerPermission(List<PolicyRule> rules, String serviceAccountName

private void handleClusterPermission(List<PolicyRule> rules,
String serviceAccountName,
NamedInstallStrategyFluent.SpecNested<?> installSpec) {
NamedInstallStrategyFluent<?>.SpecNested<?> installSpec) {

Predicate<StrategyDeploymentPermissionsBuilder> sameServiceAccountName = p -> serviceAccountName
.equals(p.getServiceAccountName());
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<packaging>pom</packaging>
<name>Quarkus - Operator SDK - Parent</name>
<properties>
<quarkus.version>3.4.2</quarkus.version>
<quarkus.version>3.5.0</quarkus.version>
<java-operator-sdk.version>4.5.0</java-operator-sdk.version>
</properties>
<scm>
Expand Down
Loading