diff --git a/.gitconfig b/.gitconfig index 5b44193..47ebe1c 100644 --- a/.gitconfig +++ b/.gitconfig @@ -21,7 +21,7 @@ basename = "!git remote -v | head -n1 | awk '{print $2}' | sed 's/.*\\///' | sed 's/\\.git//'" org-name = "!git remote -v | grep -m 1 -o ':.*/' | sed 's:^.\\(.*\\).$:\\1:'" branch-name = "!git rev-parse --abbrev-ref HEAD" - changelog-changed = "!test $(git diff --name-only HEAD origin/master | grep CHANGELOG.md | wc -l | xargs) = 1" + changelog-changed = "!test $(git diff --name-only HEAD origin/$(git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@') | grep CHANGELOG.md | wc -l | xargs) = 1" main = "!git remote set-head origin --auto && git checkout $(git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@') && git pull" publish = "!func(){ if [[ $(git branch-name) != \"$(git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@')\" ]]; then git push -u origin $(git branch-name) && (git changelog-changed || echo '\n\n⚠️ Dont forget to update changelog ⚠️ ') ; else echo "Wat?!"; fi; }; func" @@ -41,3 +41,5 @@ [url "ssh://git@github.com"] insteadOf = https://github.com +[url "ssh://git@gitlab.et-scm.com/"] + insteadOf = https://gitlab.et-scm.com diff --git a/.k9s/config.yml b/.k9s/config.yml index 2312ad4..9978f15 100644 --- a/.k9s/config.yml +++ b/.k9s/config.yml @@ -13,8 +13,80 @@ k9s: fullScreenLogs: false textWrap: false showTime: false - currentContext: default + currentContext: core-elsevier-platform + currentCluster: arn:aws:eks:eu-west-1:183742092277:cluster/core-elsevier-platform clusters: + arn:aws:eks:eu-west-1:116634825266:cluster/ce-automation: + namespace: + active: twistlock-operator-system + favorites: + - twistlock-operator-system + - kube-system + - default + view: + active: sc + featureGates: + nodeShell: false + shellPod: + image: busybox:1.31 + namespace: default + limits: + cpu: 100m + memory: 100Mi + portForwardAddress: localhost + arn:aws:eks:eu-west-1:183742092277:cluster/core-elsevier-platform: + namespace: + active: platform-manager + favorites: + - platform-manager + - all + - default + view: + active: dp default + featureGates: + nodeShell: false + shellPod: + image: busybox:1.31 + namespace: default + limits: + cpu: 100m + memory: 100Mi + portForwardAddress: localhost + arn:aws:eks:eu-west-1:702267635140:cluster/ce-prod: + namespace: + active: default + favorites: + - all + - twistlock-operator-system + - default + view: + active: cj + featureGates: + nodeShell: false + shellPod: + image: busybox:1.31 + namespace: default + limits: + cpu: 100m + memory: 100Mi + portForwardAddress: localhost + arn:aws:eks:eu-west-1:781632261136:cluster/test-cluster: + namespace: + active: "" + favorites: + - all + - default + view: + active: po + featureGates: + nodeShell: false + shellPod: + image: busybox:1.31 + namespace: default + limits: + cpu: 100m + memory: 100Mi + portForwardAddress: localhost thresholds: cpu: critical: 90