nikhita

diff --git a/artifacts/scripts/util.sh b/artifacts/scripts/util.sh
index e9e3d01..7875b46 100755
--- a/artifacts/scripts/util.sh
+++ b/artifacts/scripts/util.sh
@@ -380,7 +380,7 @@ sync_repo() {
             squash ${squash_commits}
 
             # if there is no pending merge commit, update Godeps.json because this could be a target of tag
-            if [ -z "${k_pending_merge_commit}" ]; then
+            if ! pick-incorrect-godep-changes ${k_mainline_commit} && [ -z "${k_pending_merge_commit}" ]; then

nikhita

#!/bin/bash -ex

cd $GOPATH/src/k8s.io

rm -rf cache.new
if [ ! -d cache ]; then
    mkdir cache.new
    pushd cache.new
    for repo in $(ls -1 ../kubernetes/staging/src/k8s.io); do
	git clone https://github.com/kubernetes/${repo}.git

nikhita

import requests

repos = [
    'kubernetes',
    'kubernetes-client',
    'kubernetes-csi',
    'kubernetes-incubator',
    'kubernetes-sigs',
]

nikhita

#!/bin/bash -ex

rm -rf cache.new
if [ ! -d cache ]; then
    mkdir cache.new
    pushd cache.new
    for repo in $(ls -1 ../kubernetes/staging/src/k8s.io); do
	git clone https://github.com/kubernetes/${repo}.git
    done
    popd

nikhita

Check broken links in Kubernetes Community repo

To help the community and make sure that all documentation is up to date and correct, a very important role to play is to make sure all links are working correctly.

To do this, you can use simple tools such as markdown-link-check.

Setup

1. Install markdown-link-check.

nikhita

How to get Twitter gifs and short videos working on Firefox on Fedora

Note: This is for Fedora 28, however the process should be similar for other recent Fedora versions as well.

1. Go to https://www.youtube.com/html5 and check if all boxes are checked. If gifs or short videos don't work for you, you mostly do not have H.264 and MSE & H.264.

2. There are a bunch of repositories you need to setup.

sudo dnf install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm

nikhita

[merge]
tool = mymeld
conflictstyle = diff3

[mergetool "mymeld"]
# Shows three-pane merge view with central output directly being the merged file to save
cmd = $MANISHMELD $LOCAL $BASE $REMOTE --output=$MERGED
#cmd = meld "$LOCAL" "$BASE" "$REMOTE"

nikhita

#!/bin/bash -ex

rm -rf cache.new
if [ ! -d cache ]; then
    mkdir cache.new
    pushd cache.new
    for repo in $(ls -1 ../kubernetes/staging/src/k8s.io); do
	git clone git@github.com:kubernetes/${repo}.git
    done
    popd

nikhita

https://github.com/kubernetes/kubernetes/pull/59159
https://github.com/kubernetes/kubernetes/pull/59966
https://github.com/kubernetes/kubernetes/pull/55168
https://github.com/kubernetes/kubernetes/pull/60055
https://github.com/kubernetes/kubernetes/pull/58111
https://github.com/kubernetes/kubernetes/pull/59316
https://github.com/kubernetes/kubernetes/pull/58544
https://github.com/kubernetes/kubernetes/pull/54933
https://github.com/kubernetes/kubernetes/pull/59821
https://github.com/kubernetes/kubernetes/pull/59587

nikhita

'use strict';

const fs = require('fs')
const http = require('http')

const K8S_HOST = process.env['K8S_HOST'] || '10.100.0.1'
const K8S_SECRET = process.env['K8S_SECRET'] ||
  fs.readFileSync('/var/run/secrets/kubernetes.io/serviceaccount/token', 'utf-8')

var req = http.request({