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.

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

OCPBUGS-35462: rebase CPO master on upstream 1.30 #286

Closed
wants to merge 24 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
7373f0c
Use k3s with containerd (#2529)
dulek Jan 30, 2024
119a3ea
CI: Fetch DevStack and k3s logs (#2527)
dulek Jan 30, 2024
73d2661
Ingress: Fix listener timeout updates (#2518)
dulek Jan 31, 2024
7f1daa8
Add support to only run selected CSI services (#2316)
NotTheEvilOne Feb 2, 2024
6eda649
[ci] Bump golangci-lint for go 1.22 (#2544)
mandre Feb 8, 2024
e87f506
cinder-csi: Adds support for managing backups (#2473) (#2480)
Sebastian-RG Feb 8, 2024
d9106b3
fix: add missing labels to resources (#2519)
cwrau Feb 20, 2024
89d264f
[octavia-ingress-controller] Add annotations to keep floating IP and/…
ccleouf66 Feb 29, 2024
7eeef2f
Pass KeyId to EncryptResponse (#2535)
GlassOfWhiskey Mar 5, 2024
c63fa7b
Improve CCM docs in dual-stack context (#2563)
dulek Mar 15, 2024
b75efdb
Update KMS API to v2 (#2561)
dulek Mar 15, 2024
d28a24b
Remove enforcement of IPv6 LB as internal (#2557)
MaysaMacedo Mar 19, 2024
ea198dd
Convert outstanding commands to cobra (#2384)
stephenfin Mar 21, 2024
3225d98
Update the release procedure (#2565)
dulek Mar 28, 2024
290e7c7
Allow changing cluster-name on existing deployments (#2552)
dulek Apr 8, 2024
dab0f06
added route section to cloud-config secret (#2570)
frittenlab Apr 12, 2024
b343c1b
[cinder-csi-plugin] define availability zone for snapshot backup (#2569)
zetaab Apr 24, 2024
59963c8
Set `--use-service-account-credentials=false` (#2572)
dulek Apr 25, 2024
6387cbb
Update Cinder and Manila CSI charts maintainers (#2583)
dulek Apr 25, 2024
b6d73d6
Bump K8s to v1.30.0 (#2581)
dulek Apr 26, 2024
7a4290e
[occm] KEP-1860: Add support for LoadBalancer ipMode (#2587)
kbudde May 7, 2024
2f186d6
Bump versions for 1.30 (#2589)
zetaab May 7, 2024
89aa2cc
[release-1.30] [occm] add a node selector support for loadbalancer se…
k8s-infra-cherrypick-robot May 28, 2024
a98f558
Merge remote-tracking branch 'kubernetes/release-1.30' into sync-master
EmilienM Jun 14, 2024
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
Prev Previous commit
Next Next commit
Pass KeyId to EncryptResponse (kubernetes#2535)
  • Loading branch information
GlassOfWhiskey authored Mar 5, 2024
commit 7eeef2f280542acf539a62f289311c4602ae9c45
2 changes: 1 addition & 1 deletion pkg/kms/server/server.go
Original file line number Diff line number Diff line change
@@ -148,5 +148,5 @@ func (s *KMSserver) Encrypt(ctx context.Context, req *pb.EncryptRequest) (*pb.En
klog.V(4).Infof("Failed to encrypt data %v: ", err)
return nil, err
}
return &pb.EncryptResponse{Ciphertext: cipher}, nil
return &pb.EncryptResponse{Ciphertext: cipher, KeyId: s.cfg.KeyManager.KeyID}, nil
}