You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2021/05/21 09:22:21 UTC
[cloudstack-kubernetes-provider] branch master updated: Inclusivity
changes for CloudStack - rename some offensive words/terms as appropriate,
that are meaningful and inclusive. (#29)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack-kubernetes-provider.git
The following commit(s) were added to refs/heads/master by this push:
new 229a2d7 Inclusivity changes for CloudStack - rename some offensive words/terms as appropriate, that are meaningful and inclusive. (#29)
229a2d7 is described below
commit 229a2d705a821fc0a3169ec94ec052cdde95c1c3
Author: sureshanaparti <12...@users.noreply.github.com>
AuthorDate: Fri May 21 14:52:02 2021 +0530
Inclusivity changes for CloudStack - rename some offensive words/terms as appropriate, that are meaningful and inclusive. (#29)
* Inclusivity changes for CloudStack - rename some offensive words/terms as appropriate, that are meaningful and inclusive.
- Renamed default git branch name from 'master' to 'main'.
- Replaced whitelist and blacklist with allowlist and denylist respectively.
* Reverted third party rename changes, and removed irrelevant comment
---
Makefile | 2 +-
cloudstack_loadbalancer.go | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index c6d336b..aebd9ff 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ GIT_COMMIT_SHORT=$(shell git rev-parse --short HEAD)
GIT_TAG=$(shell git describe --abbrev=0 --tags 2>/dev/null || echo v0.0.0)
GIT_IS_TAG=$(shell git describe --exact-match --abbrev=0 --tags 2>/dev/null || echo NOT_A_TAG)
ifeq (${GIT_IS_TAG},NOT_A_TAG)
-GIT_VERSION?=$(patsubst v%,%,${GIT_TAG})-master+${GIT_COMMIT}
+GIT_VERSION?=$(patsubst v%,%,${GIT_TAG})-main+${GIT_COMMIT}
else
GIT_VERSION?=$(patsubst v%,%,${GIT_TAG})
endif
diff --git a/cloudstack_loadbalancer.go b/cloudstack_loadbalancer.go
index dbf6dd3..1af6cae 100644
--- a/cloudstack_loadbalancer.go
+++ b/cloudstack_loadbalancer.go
@@ -121,9 +121,6 @@ func (cs *CSCloud) EnsureLoadBalancer(ctx context.Context, clusterName string, s
klog.V(4).Infof("Load balancer %v is associated with IP %v", lb.name, lb.ipAddr)
- // Fetch the IP whitelist from the spec if any
- //whitelist = service.Spec.LoadBalancerSourceRanges
-
for _, port := range service.Spec.Ports {
// Construct the protocol name first, we need it a few times
protocol := ProtocolFromServicePort(port, service.Annotations)