Skip to content

Commit

Permalink
Automated repo sync 20241008
Browse files Browse the repository at this point in the history
Update repo from v1.32.0-alpha.0 to v1.32.0-alpha.1 (release-1.32) (#4684)
Update repo from v1.31.1 to v1.32.0-alpha.0 (release-1.32) (#4681)
Update kube-update.sh to use git tag if release not found (#4680)
  • Loading branch information
iksrochpub committed Oct 8, 2024
1 parent 0b19baf commit 331db7b
Show file tree
Hide file tree
Showing 20 changed files with 153 additions and 149 deletions.
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ******************************************************************************
# IBM Cloud Kubernetes Service, 5737-D43
# (C) Copyright IBM Corp. 2022 All Rights Reserved.
# (C) Copyright IBM Corp. 2022, 2024 All Rights Reserved.
#
# SPDX-License-Identifier: Apache2.0
#
Expand Down
12 changes: 6 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
language: go

go:
- 1.22.6
- 1.23.0

dist: bionic

Expand Down Expand Up @@ -88,19 +88,19 @@ deploy:
skip_cleanup: true
on:
tags: true
condition: ${TRAVIS_TAG} == v1.31.1-* && ${TRAVIS_JOB_NAME} == Internal
go: 1.22.6
condition: ${TRAVIS_TAG} == v1.32.0-alpha.1-* && ${TRAVIS_JOB_NAME} == Internal
go: 1.23.0
- provider: script
script: BUILD_TAG=${TRAVIS_TAG} make deploy
skip_cleanup: true
on:
tags: true
go: 1.22.6
go: 1.23.0
condition: ${TRAVIS_TAG} == dev-* && ${TRAVIS_JOB_NAME} == Internal
- provider: script
script: ./scripts/publishTag.sh
skip_cleanup: true
on:
branch: release-1.31
go: 1.22.6
branch: release-1.32
go: 1.23.0
condition: ${TRAVIS_COMMIT_MESSAGE} =~ push_build && ${TRAVIS_JOB_NAME} == Internal
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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.59.1
GOLANGCI_LINT_VERSION := 1.61.0
GOLANGCI_LINT_EXISTS := $(shell golangci-lint --version 2>/dev/null)

HUB_RLS ?= 2.14.2
REGISTRY ?= armada-master
TAG ?= v1.31.1
TAG ?= v1.32.0-alpha.1

NANCY_VERSION := 1.0.46

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
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.31.1](https://github.com/kubernetes/kubernetes/tree/v1.31.1).
[Kubernetes version v1.32.0-alpha.1](https://github.com/kubernetes/kubernetes/tree/v1.32.0-alpha.1).
See [CONTRIBUTING.md](./CONTRIBUTING.md) for contribution guidelines.

## Local Build and Deploy Instructions
Expand Down
2 changes: 1 addition & 1 deletion addons/classic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
source: github.ibm.com/alchemy-containers/armada-classic-lb

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

# (Required) - source directory in the github repo containing GO files
source_dir: pkg/classic
Expand Down
2 changes: 1 addition & 1 deletion addons/vpcctl.yml
Original file line number Diff line number Diff line change
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.31.1
release: v0.32.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
Original file line number Diff line number Diff line change
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.31.1-1
image: registry.ng.bluemix.net/armada-master/ibm-cloud-controller-manager:v1.32.0-alpha.1-1
imagePullPolicy: IfNotPresent
securityContext:
runAsNonRoot: true
Expand Down
51 changes: 25 additions & 26 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module cloud.ibm.com/cloud-provider-ibm

go 1.22.6
go 1.23.0

require (
github.com/IBM/go-sdk-core/v5 v5.17.5
Expand All @@ -12,17 +12,17 @@ require (
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.9.0
gopkg.in/gcfg.v1 v1.2.3
k8s.io/api v0.31.1
k8s.io/apimachinery v0.31.1
k8s.io/client-go v0.31.1
k8s.io/cloud-provider v0.31.1
k8s.io/component-base v0.31.1
k8s.io/component-helpers v0.31.1
k8s.io/api v0.32.0-alpha.1
k8s.io/apimachinery v0.32.0-alpha.1
k8s.io/client-go v0.32.0-alpha.1
k8s.io/cloud-provider v0.32.0-alpha.1
k8s.io/component-base v0.32.0-alpha.1
k8s.io/component-helpers v0.32.0-alpha.1
k8s.io/klog/v2 v2.130.1
)

require (
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
github.com/NYTimes/gziphandler v1.1.1 // indirect
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
Expand All @@ -40,9 +40,9 @@ require (
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/errors v0.22.0 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.4 // indirect
github.com/go-openapi/swag v0.23.0 // 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.19.0 // indirect
Expand All @@ -58,7 +58,6 @@ require (
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
github.com/imdario/mergo v0.3.6 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
Expand All @@ -78,9 +77,9 @@ require (
github.com/prometheus/procfs v0.15.1 // indirect
github.com/stoewer/go-strcase v1.2.0 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
go.etcd.io/etcd/api/v3 v3.5.16 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect
go.etcd.io/etcd/client/v3 v3.5.16 // indirect
go.mongodb.org/mongo-driver v1.14.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
Expand All @@ -92,15 +91,15 @@ require (
go.opentelemetry.io/otel/trace v1.28.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
golang.org/x/net v0.26.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/crypto v0.26.0 // indirect
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/term v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.23.0 // indirect
golang.org/x/term v0.23.0 // indirect
golang.org/x/text v0.17.0 // indirect
golang.org/x/time v0.3.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
Expand All @@ -112,10 +111,10 @@ require (
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.31.1 // indirect
k8s.io/controller-manager v0.31.1 // indirect
k8s.io/kms v0.31.1 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
k8s.io/apiserver v0.32.0-alpha.1 // indirect
k8s.io/controller-manager v0.32.0-alpha.1 // indirect
k8s.io/kms v0.32.0-alpha.1 // indirect
k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2 // indirect
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
Expand Down
Loading

0 comments on commit 331db7b

Please sign in to comment.