Skip to content

Instantly share code, notes, and snippets.

View ixdy's full-sized avatar

Jeff Grafton ixdy

View GitHub Profile

Keybase proof

I hereby claim:

  • I am ixdy on github.
  • I am jgrafton (https://keybase.io/jgrafton) on keybase.
  • I have a public key ASAC1ay3et9rdgkrGu-AKF1Yj4QPpdEAeozA0tK1EwfeOwo

To claim this, I am signing this object:

@ixdy
ixdy / k-k-conflicts.txt
Last active March 4, 2020 19:06
kubernetes/kubernetes merge conflicts on 2020-03-04
* kubernetes/kubernetes/pull/88474:
pkg/controller/cloud/BUILD
pkg/controller/cloud/node_controller.go
* kubernetes/kubernetes/pull/87182:
hack/.staticcheck_failures
pkg/volume/rbd/rbd.go
pkg/volume/rbd/rbd_util.go
* kubernetes/kubernetes/pull/86357:
pkg/kubelet/apis/config/types.go
* kubernetes/kubernetes/pull/86304:
{
"name": "svg",
"attrs": {
"xmlns": "http://www.w3.org/2000/svg",
"role": "img",
"viewBox": "-1.12 -0.87 231.98 278.98"
},
"childs": [
{
"name": "defs",
@ixdy
ixdy / yubikey4-ssh-macos.md
Last active April 12, 2024 20:19
Setting up ssh public key authentication on macOS using a YubiKey 4

Setting up ssh public key authentication on macOS using a YubiKey 4

I largely followed Florin's blog post, but have a few notes to add regarding issues I encountered:

Basic setup notes

  1. I used a YubiKey 4, while the blog describes using a YubiKey NEO. I'm sure a YubiKey 5 would also work. I'm also running macOS 10.13.6.
  2. I installed GPGTools as recommended. However, as I'll note later, it seems that gpg-agent only automatically starts when gpg is used; for ssh, you'll need to ensure it's running.
  3. Before generating your keys, decide what key size you want to use. If you run the list command inside gpg --edit-card, look for the Key attributes line to see what is currently selected. On my YubiKey 4, it defaulted to 2048 bits for all keys:
Key attributes ...: rsa2048 rsa2048 rsa2048
@ixdy
ixdy / conflicts.txt
Created February 6, 2017 21:19
kubernetes/kubernetes PR merge conflicts
# ./find-merge-conflicts.sh kubernetes kubernetes > conflicts.txt
* kubernetes/kubernetes/pull/40946:
pkg/kubelet/dockershim/docker_service.go
pkg/kubelet/dockershim/docker_service_test.go
* kubernetes/kubernetes/pull/40854:
test/e2e/cluster_upgrade.go
test/e2e/upgrades/BUILD
* kubernetes/kubernetes/pull/40848:
pkg/genericapiserver/endpoints/handlers/responsewriters/status.go
pkg/genericapiserver/endpoints/handlers/responsewriters/writers.go
diff -ruN /tmp/JJB-nVWVc/upstream/gitbranch.txt /tmp/JJB-nVWVc/patch/gitbranch.txt
--- /tmp/JJB-nVWVc/upstream/gitbranch.txt 2016-04-11 14:26:28.375187482 -0700
+++ /tmp/JJB-nVWVc/patch/gitbranch.txt 2016-04-11 14:26:31.303194321 -0700
@@ -1 +1 @@
-master
+dockerized-e2e
diff -ruN /tmp/JJB-nVWVc/upstream/gitversion.txt /tmp/JJB-nVWVc/patch/gitversion.txt
--- /tmp/JJB-nVWVc/upstream/gitversion.txt 2016-04-11 14:26:28.371187473 -0700
+++ /tmp/JJB-nVWVc/patch/gitversion.txt 2016-04-11 14:26:31.299194312 -0700
@@ -1 +1 @@
diff -ruN /tmp/JJB-ZfkGD/upstream/gitbranch.txt /tmp/JJB-ZfkGD/patch/gitbranch.txt
--- /tmp/JJB-ZfkGD/upstream/gitbranch.txt 2016-04-08 17:20:37.612930711 -0700
+++ /tmp/JJB-ZfkGD/patch/gitbranch.txt 2016-04-08 17:20:40.436937770 -0700
@@ -1 +1 @@
-master
+dockerized-e2e
diff -ruN /tmp/JJB-ZfkGD/upstream/gitversion.txt /tmp/JJB-ZfkGD/patch/gitversion.txt
--- /tmp/JJB-ZfkGD/upstream/gitversion.txt 2016-04-08 17:20:37.608930701 -0700
+++ /tmp/JJB-ZfkGD/patch/gitversion.txt 2016-04-08 17:20:40.432937760 -0700
@@ -1 +1 @@