Skip to content

Commit

Permalink
Merge pull request openshift#60 from Karthik-K-N/merge-28-11-2023
Browse files Browse the repository at this point in the history 
MULTIARCH-4036: Manual rebase of upstream release 1.28 on 28-11-2023
  • Loading branch information
@openshift-merge-bot
openshift-merge-bot[bot] committed Nov 29, 2023
2 parents edcc4dc + 91bee88 commit e9719c6
Show file tree
Hide file tree
Showing 1,945 changed files with 172,664 additions and 76,786 deletions.
37 changes: 20 additions & 17 deletions .travis.yml
View file
Expand Up @@ -19,17 +19,16 @@
language: go

go:
- 1.20.4
- 1.20.11

dist: bionic

env:
global:
- IKS_PIPELINE_IAM_APIKEY="${ALL_GLOBAL_NETWORK_IKS_PIPELINE_IAM_APIKEY_20221103}"
- IKS_PIPELINE_IAM_APIKEY="${ALL_GLOBAL_NETWORK_IKS_PIPELINE_IAM_APIKEY_20231110}"
- registry_iam_api_key="${ALL_GLOBAL_registry_iam_api_key_20230427}"
- GHE_TOKEN="${ALL_GLOBAL_GHE_TOKEN_20230428}"
- TRAVIS_HOSTNAME="travis.ibm.com"
- ARTIFACTORY_AUTH_HEADER_FILE="/tmp/.artifactory-auth-header"
- TRAVIS_INTERNAL_HOSTNAME="v3.travis.ibm.com"

sudo: required

Expand All @@ -41,14 +40,17 @@ git:

jobs:
include:
- name: "Default"
env: BUILD_JOB_NAME="Default"
- name: "Internal"
env: ARTIFACTORY_AUTH_HEADER_FILE="/tmp/.artifactory-auth-header"
- name: "No Artifactory"
env: BUILD_JOB_NAME="No Artifactory" ARTIFACTORY_AUTH_HEADER_FILE=""
env: ARTIFACTORY_AUTH_HEADER_FILE=""

before_install:
- echo "${TRAVIS_BUILD_WEB_URL}" && export TRAVIS_BUILD_WEB_URL=$(echo "$TRAVIS_BUILD_WEB_URL" | sed "s/:\/\/\//:\/\/${TRAVIS_HOSTNAME}\//") && echo "${TRAVIS_BUILD_WEB_URL}"
- export REPO_BASE_URL=$(git config --get remote.origin.url | awk -F'[@:]' '{print $2}') && echo "${REPO_BASE_URL}"
- echo "${TRAVIS_BUILD_WEB_URL}"
- if [[ ${TRAVIS_JOB_NAME} == Internal && ${TRAVIS_BUILD_WEB_URL} != *${TRAVIS_INTERNAL_HOSTNAME}* ]]; then echo "Not running on internal Travis host"; travis_terminate 0; fi
- export REPO_ORIGIN_URL=$(git config --get remote.origin.url) && echo "${REPO_ORIGIN_URL}"
- export REPO_BASE_URL=$(echo "${REPO_ORIGIN_URL}" | cut -d'@' -f2 | cut -d':' -f1) && echo "${REPO_BASE_URL}"
- if [[ "${REPO_BASE_URL}" == "" ]]; then export REPO_BASE_URL=$(echo "${REPO_ORIGIN_URL}" | cut -f3 -d'/') && echo "${REPO_BASE_URL}"; fi
- export REPO_SOURCE_URL="https://${REPO_BASE_URL}/${TRAVIS_REPO_SLUG}/commit/${TRAVIS_COMMIT}" && echo "${REPO_SOURCE_URL}"
- export BUILD_URL="${TRAVIS_BUILD_WEB_URL}"
# NOTE(cjschaef): Rather than setup a separate build to access Python 3, override pyenv
Expand All @@ -57,8 +59,9 @@ before_install:
- make setup-build

before_script:
- if [[ ${TRAVIS_EVENT_TYPE} == cron && ${BUILD_JOB_NAME} == Default ]]; then ./kube-update.sh; make runanalyzedeps || true; travis_terminate 0; fi
- if [[ ${TRAVIS_EVENT_TYPE} == cron && ${TRAVIS_JOB_NAME} == Internal ]]; then ./kube-update.sh; make runanalyzedeps || true; travis_terminate 0; fi
- make install-golangci-lint
- make classic
- make vpcctl

script:
Expand All @@ -85,19 +88,19 @@ deploy:
skip_cleanup: true
on:
tags: true
condition: ${TRAVIS_TAG} == v1.27.2-* && ${BUILD_JOB_NAME} == Default
go: 1.20.4
condition: ${TRAVIS_TAG} == v1.28.4-* && ${TRAVIS_JOB_NAME} == Internal
go: 1.20.11
- provider: script
script: BUILD_TAG=${TRAVIS_TAG} make deploy
skip_cleanup: true
on:
tags: true
go: 1.20.4
condition: ${TRAVIS_TAG} == dev-* && ${BUILD_JOB_NAME} == Default
go: 1.20.11
condition: ${TRAVIS_TAG} == dev-* && ${TRAVIS_JOB_NAME} == Internal
- provider: script
script: ./scripts/publishTag.sh
skip_cleanup: true
on:
branch: release-1.27
go: 1.20.4
condition: ${TRAVIS_COMMIT_MESSAGE} =~ push_build && ${BUILD_JOB_NAME} == Default
branch: release-1.28
go: 1.20.11
condition: ${TRAVIS_COMMIT_MESSAGE} =~ push_build && ${TRAVIS_JOB_NAME} == Internal
15 changes: 12 additions & 3 deletions Makefile
View file
Expand Up @@ -28,7 +28,7 @@ CALICOCTL_CHECKSUM=$(shell cat addons/calicoctl.yml | awk '/^checksum:/{print $$
# - ARTIFACTORY_TOKEN_PATH
# - ARTIFACTORY_AUTH_HEADER_FILE
ifdef ARTIFACTORY_AUTH_HEADER_FILE
IMAGE_SOURCE := wcp-alchemy-containers-team-gcr-docker-remote.artifactory.swg-devops.com
IMAGE_SOURCE := docker-na-private.artifactory.swg-devops.com/wcp-alchemy-containers-team-gcr-docker-remote
CALICOCTL_CURL_HEADERS := "-H @${ARTIFACTORY_AUTH_HEADER_FILE}"
CALICOCTL_CURL_URL=$(shell cat addons/calicoctl.yml | awk '/^source_artifactory:/{print $$2}')
else
Expand All @@ -45,12 +45,12 @@ YAML_FILES=$(shell find . -type f -name '*.y*ml' -not -path "./build-tools/*" -n
INI_FILES=$(shell find . -type f -name '*.ini' -not -path "./build-tools/*")
OSS_FILES := go.mod

GOLANGCI_LINT_VERSION := 1.51.2
GOLANGCI_LINT_VERSION := 1.53.2
GOLANGCI_LINT_EXISTS := $(shell golangci-lint --version 2>/dev/null)

HUB_RLS ?= 2.14.2
REGISTRY ?= armada-master
TAG ?= v1.27.2
TAG ?= v1.28.4

NANCY_VERSION := 1.0.42

Expand Down Expand Up @@ -189,6 +189,15 @@ calicoctlcli:
sudo chmod 755 /usr/local/bin/calicoctl
sudo mkdir -p /etc/calico/ && sudo touch /etc/calico/calicoctl.cfg

.PHONY: classic
classic:
ifdef ARTIFACTORY_AUTH_HEADER_FILE
@echo "Update pkg/classic to use alternate classic library"
./scripts/updatePackage.sh addons/classic.yml
else
@echo "Use the existing pkg/classic logic"
endif

.PHONY: vpcctl
vpcctl:
ifdef ARTIFACTORY_AUTH_HEADER_FILE
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Expand Up @@ -6,7 +6,7 @@ infrastructure node and load balancer support to
[Kubernetes](https://kubernetes.io/docs/home/) or
[OpenShift](https://docs.openshift.com/) clusters running on
[IBM Cloud](https://cloud.ibm.com/docs). This repository branch is based on
[Kubernetes version v1.27.2](https://github.com/kubernetes/kubernetes/tree/v1.27.2).
[Kubernetes version v1.28.4](https://github.com/kubernetes/kubernetes/tree/v1.28.4).
See [CONTRIBUTING.md](./CONTRIBUTING.md) for contribution guidelines.

## Local Build and Deploy Instructions
Expand Down
51 changes: 51 additions & 0 deletions addons/classic.yml
View file
@@ -0,0 +1,51 @@
# ******************************************************************************
# IBM Cloud Kubernetes Service, 5737-D43
# (C) Copyright IBM Corp. 2023 All Rights Reserved.
#
# SPDX-License-Identifier: Apache2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# ******************************************************************************

# (Required) - the source github repo which will be used to retrieve GO files from
source: github.ibm.com/alchemy-containers/armada-classic-lb

# (Required) - git release or branch name in the source github repo
release: v0.1.0

# (Required) - source directory in the github repo containing GO files
source_dir: pkg/classic

# (Optional) - target directory in current repo where the GO files will be copied to
# if this field is not set, defaults to the same path as the source_dir
target_dir:

# (Optional) - grep search string which will be done before / after the sed commands are done on the GO logic
grep_string: Copyright

# (Optional) - sed commands to update the GO source files copied from source repo
sed_command_1: s/2022 All Rights Reserved/2023 All Rights Reserved/
sed_command_2:
sed_command_3:

# (Optional) - set to "true" if the local repo's go.mod needs to be updated / refreshed
# all other values are ignored and the local go.mod is not updated
update_go_mod: true

# (Optional) - set to "auto-detect" to adjust local go.mod with the contents of source repo's go.mod
# alternatively, a space separated list of go modules (format [module:version]) can be specified
go_get_updates: auto-detect

# (Required) - set to "false" to NOT create a PR for the GO files that were copied
# otherwise set to the branch the PR should be created for
create_pr: false
2 changes: 1 addition & 1 deletion addons/vpcctl.yml
View file
Expand Up @@ -21,7 +21,7 @@
source: github.ibm.com/alchemy-containers/armada-vpc-lb

# (Required) - git release or branch name in the source github repo
release: v0.16.0
release: v0.20.0

# (Required) - source directory in the github repo containing GO files
source_dir: pkg/vpcctl
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/ibm-cloud-controller-manager.yaml
View file
Expand Up @@ -70,7 +70,7 @@ spec:
terminationGracePeriodSeconds: 90
containers:
- name: ibm-cloud-controller-manager
image: registry.ng.bluemix.net/armada-master/ibm-cloud-controller-manager:v1.27.2-1
image: registry.ng.bluemix.net/armada-master/ibm-cloud-controller-manager:v1.28.4-1
imagePullPolicy: IfNotPresent
securityContext:
runAsNonRoot: true
Expand Down
138 changes: 70 additions & 68 deletions go.mod
View file
Expand Up @@ -3,64 +3,64 @@ module cloud.ibm.com/cloud-provider-ibm
go 1.20

require (
github.com/IBM-Cloud/power-go-client v1.2.3
github.com/IBM/go-sdk-core/v5 v5.13.4
github.com/IBM/platform-services-go-sdk v0.39.0
github.com/IBM/vpc-go-sdk v0.38.0
github.com/fsnotify/fsnotify v1.6.0
github.com/IBM/go-sdk-core/v5 v5.15.0
github.com/IBM/platform-services-go-sdk v0.54.0
github.com/IBM/vpc-go-sdk v0.44.0
github.com/fsnotify/fsnotify v1.7.0
github.com/go-openapi/strfmt v0.21.7
github.com/spf13/cobra v1.7.0
github.com/spf13/cobra v1.8.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.8.4
gopkg.in/gcfg.v1 v1.2.3
k8s.io/api v0.27.2
k8s.io/apimachinery v0.27.2
k8s.io/client-go v0.27.2
k8s.io/cloud-provider v0.27.2
k8s.io/component-base v0.27.2
k8s.io/klog/v2 v2.100.1
k8s.io/utils v0.0.0-20230505201702-9f6742963106
k8s.io/api v0.28.4
k8s.io/apimachinery v0.28.4
k8s.io/client-go v0.28.4
k8s.io/cloud-provider v0.28.4
k8s.io/component-base v0.28.4
k8s.io/component-helpers v0.28.4
k8s.io/klog/v2 v2.110.1
)

require (
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/IBM-Cloud/power-go-client v1.5.4 // indirect
github.com/NYTimes/gziphandler v1.1.1 // indirect
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd/v22 v22.4.0 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/coreos/go-semver v0.3.1 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/analysis v0.21.2 // indirect
github.com/go-openapi/errors v0.20.3 // indirect
github.com/go-openapi/analysis v0.21.4 // indirect
github.com/go-openapi/errors v0.20.4 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.1 // indirect
github.com/go-openapi/loads v0.21.1 // indirect
github.com/go-openapi/runtime v0.23.0 // indirect
github.com/go-openapi/spec v0.20.4 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/go-openapi/validate v0.20.3 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/loads v0.21.2 // indirect
github.com/go-openapi/runtime v0.26.0 // indirect
github.com/go-openapi/spec v0.20.8 // indirect
github.com/go-openapi/swag v0.22.4 // indirect
github.com/go-openapi/validate v0.22.1 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.13.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/cel-go v0.12.6 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/google/cel-go v0.16.1 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.1 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-retryablehttp v0.7.2 // indirect
github.com/imdario/mergo v0.3.12 // indirect
Expand All @@ -69,7 +69,7 @@ require (
github.com/json-iterator/go v1.1.12 // indirect
github.com/leodido/go-urn v1.2.3 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
Expand All @@ -79,50 +79,52 @@ require (
github.com/opentracing/opentracing-go v1.2.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.14.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
github.com/stoewer/go-strcase v1.2.0 // indirect
go.etcd.io/etcd/api/v3 v3.5.7 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
go.etcd.io/etcd/client/v3 v3.5.7 // indirect
go.etcd.io/etcd/api/v3 v3.5.9 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
go.etcd.io/etcd/client/v3 v3.5.9 // indirect
go.mongodb.org/mongo-driver v1.11.3 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 // indirect
go.opentelemetry.io/otel v1.10.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 // indirect
go.opentelemetry.io/otel/metric v0.31.0 // indirect
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
go.opentelemetry.io/otel/trace v1.10.0 // indirect
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0 // indirect
go.opentelemetry.io/otel v1.20.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect
go.opentelemetry.io/otel/metric v1.20.0 // indirect
go.opentelemetry.io/otel/sdk v1.20.0 // indirect
go.opentelemetry.io/otel/trace v1.20.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.19.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/oauth2 v0.11.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.14.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
golang.org/x/time v0.3.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
google.golang.org/grpc v1.51.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/grpc v1.59.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiserver v0.27.2 // indirect
k8s.io/component-helpers v0.27.2 // indirect
k8s.io/controller-manager v0.27.2 // indirect
k8s.io/kms v0.27.2 // indirect
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
k8s.io/apiserver v0.28.4 // indirect
k8s.io/controller-manager v0.28.4 // indirect
k8s.io/kms v0.28.4 // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
Expand Down

0 comments on commit e9719c6

Please sign in to comment.