From 658d5d9af3383ebac9e840510430242ced7849bd Mon Sep 17 00:00:00 2001 From: iksrochpub Date: Fri, 14 Feb 2025 18:24:11 +0000 Subject: [PATCH] Automated repo sync 20250214 Update module github.com/IBM/platform-services-go-sdk to v0.75.0 (#5013) Update ibm open source (#5012) Update golangci-lint to v1.63.4 (#4983) Update repo from v1.32.1 to v1.33.0-alpha.1 (release-1.33) (#4982) --- .travis.yml | 12 ++-- Makefile | 4 +- README.md | 2 +- .../ibm-cloud-controller-manager.yaml | 2 +- go.mod | 32 ++++----- go.sum | 66 ++++++++++--------- ibm/ibm_version.go | 2 +- main.go | 4 +- pkg/klog/logger.go | 66 ------------------- scripts/publishTag.sh | 2 +- vagrant-kube-build/Vagrantfile | 4 +- .../provisioning/build_docker_registry.sh | 2 +- 12 files changed, 67 insertions(+), 131 deletions(-) delete mode 100644 pkg/klog/logger.go diff --git a/.travis.yml b/.travis.yml index f9feea7a1..befcfb767 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ services: language: go go: - - 1.23.4 + - 1.23.5 env: global: @@ -89,19 +89,19 @@ deploy: skip_cleanup: true on: tags: true - condition: ${TRAVIS_TAG} == v1.32.1-* && ${TRAVIS_JOB_NAME} == Internal - go: 1.23.4 + condition: ${TRAVIS_TAG} == v1.33.0-alpha.1-* && ${TRAVIS_JOB_NAME} == Internal + go: 1.23.5 - provider: script script: BUILD_TAG=${TRAVIS_TAG} make deploy skip_cleanup: true on: tags: true - go: 1.23.4 + go: 1.23.5 condition: ${TRAVIS_TAG} == dev-* && ${TRAVIS_JOB_NAME} == Internal - provider: script script: ./scripts/publishTag.sh skip_cleanup: true on: - branch: release-1.32 - go: 1.23.4 + branch: release-1.33 + go: 1.23.5 condition: ${TRAVIS_COMMIT_MESSAGE} =~ push_build && ${TRAVIS_JOB_NAME} == Internal diff --git a/Makefile b/Makefile index 2d06a2867..8698e84fb 100644 --- a/Makefile +++ b/Makefile @@ -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.61.0 +GOLANGCI_LINT_VERSION := 1.63.4 GOLANGCI_LINT_EXISTS := $(shell golangci-lint --version 2>/dev/null) HUB_RLS ?= 2.14.2 REGISTRY ?= armada-master -TAG ?= v1.32.1 +TAG ?= v1.33.0-alpha.1 NANCY_VERSION := 1.0.46 diff --git a/README.md b/README.md index fe85819bc..f3f26b9d7 100644 --- a/README.md +++ b/README.md @@ -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.32.1](https://github.com/kubernetes/kubernetes/tree/v1.32.1). +[Kubernetes version v1.33.0-alpha.1](https://github.com/kubernetes/kubernetes/tree/v1.33.0-alpha.1). See [CONTRIBUTING.md](./CONTRIBUTING.md) for contribution guidelines. ## Local Build and Deploy Instructions diff --git a/docs/examples/ibm-cloud-controller-manager.yaml b/docs/examples/ibm-cloud-controller-manager.yaml index 5c697e787..849e40e57 100644 --- a/docs/examples/ibm-cloud-controller-manager.yaml +++ b/docs/examples/ibm-cloud-controller-manager.yaml @@ -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.32.1-1 + image: registry.ng.bluemix.net/armada-master/ibm-cloud-controller-manager:v1.33.0-alpha.1-1 imagePullPolicy: IfNotPresent securityContext: runAsNonRoot: true diff --git a/go.mod b/go.mod index 557ebedb1..1830b84bd 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module cloud.ibm.com/cloud-provider-ibm -go 1.23.4 +go 1.23.5 require ( github.com/IBM/go-sdk-core/v5 v5.18.5 @@ -12,17 +12,17 @@ require ( github.com/spf13/pflag v1.0.6 github.com/stretchr/testify v1.10.0 gopkg.in/gcfg.v1 v1.2.3 - k8s.io/api v0.32.2 - k8s.io/apimachinery v0.32.2 - k8s.io/client-go v0.32.2 - k8s.io/cloud-provider v0.32.2 - k8s.io/component-base v0.32.2 - k8s.io/component-helpers v0.32.2 + k8s.io/api v0.33.0-alpha.1 + k8s.io/apimachinery v0.33.0-alpha.1 + k8s.io/client-go v0.33.0-alpha.1 + k8s.io/cloud-provider v0.33.0-alpha.1 + k8s.io/component-base v0.33.0-alpha.1 + k8s.io/component-helpers v0.33.0-alpha.1 k8s.io/klog/v2 v2.130.1 ) require ( - cel.dev/expr v0.18.0 // indirect + cel.dev/expr v0.19.1 // 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 @@ -49,9 +49,9 @@ require ( github.com/go-playground/validator/v10 v10.19.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.4 // indirect - github.com/google/btree v1.0.1 // indirect - github.com/google/cel-go v0.22.0 // indirect - github.com/google/gnostic-models v0.6.8 // indirect + github.com/google/btree v1.1.3 // indirect + github.com/google/cel-go v0.23.2 // indirect + github.com/google/gnostic-models v0.6.9 // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/uuid v1.6.0 // indirect @@ -112,12 +112,12 @@ 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.32.2 // indirect - k8s.io/controller-manager v0.32.2 // indirect - k8s.io/kms v0.32.2 // indirect - k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect + k8s.io/apiserver v0.33.0-alpha.1 // indirect + k8s.io/controller-manager v0.33.0-alpha.1 // indirect + k8s.io/kms v0.33.0-alpha.1 // indirect + k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect - sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect + sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.1 // indirect sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect sigs.k8s.io/yaml v1.4.0 // indirect diff --git a/go.sum b/go.sum index 3fc2af366..63b83922c 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -cel.dev/expr v0.18.0 h1:CJ6drgk+Hf96lkLikr4rFf19WrU0BOWEihyZnI2TAzo= -cel.dev/expr v0.18.0/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw= +cel.dev/expr v0.19.1 h1:NciYrtDRIR0lNCnH1LFJegdjspNx9fI59O7TWcua/W4= +cel.dev/expr v0.19.1/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw= github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0= github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/IBM/go-sdk-core/v5 v5.18.5 h1:g0JRl3sYXJczB/yuDlrN6x22LJ6jIxhp0Sa4ARNW60c= @@ -80,16 +80,16 @@ github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZ github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg= -github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= +github.com/golang-jwt/jwt/v4 v4.5.1 h1:JdqV9zKUdtaa9gdPlywC3aeoEsR681PlKC+4F5gQgeo= +github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= -github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= -github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= -github.com/google/cel-go v0.22.0 h1:b3FJZxpiv1vTMo2/5RDUqAHPxkT8mmMfJIrq1llbf7g= -github.com/google/cel-go v0.22.0/go.mod h1:BuznPXXfQDpXKWQ9sPW3TzlAJN5zzFe+i9tIs0yC4s8= -github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= -github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= +github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg= +github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= +github.com/google/cel-go v0.23.2 h1:UdEe3CvQh3Nv+E/j9r1Y//WO0K0cSyD7/y0bzyLIMI4= +github.com/google/cel-go v0.23.2/go.mod h1:52Pb6QsDbC5kvgxvZhiL9QX1oZEkcUF/ZqaPx1J5Wwo= +github.com/google/gnostic-models v0.6.9 h1:MU/8wDLif2qCXZmzncUQ/BOfxWfthHi63KqpoNbWqVw= +github.com/google/gnostic-models v0.6.9/go.mod h1:CiWsm0s6BSQd1hRn8/QmxqB6BesYcbSZxsz9b0KuDBw= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= @@ -192,6 +192,8 @@ github.com/stoewer/go-strcase v1.3.0/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8w github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -324,32 +326,32 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.32.2 h1:bZrMLEkgizC24G9eViHGOPbW+aRo9duEISRIJKfdJuw= -k8s.io/api v0.32.2/go.mod h1:hKlhk4x1sJyYnHENsrdCWw31FEmCijNGPJO5WzHiJ6Y= -k8s.io/apimachinery v0.32.2 h1:yoQBR9ZGkA6Rgmhbp/yuT9/g+4lxtsGYwW6dR6BDPLQ= -k8s.io/apimachinery v0.32.2/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE= -k8s.io/apiserver v0.32.2 h1:WzyxAu4mvLkQxwD9hGa4ZfExo3yZZaYzoYvvVDlM6vw= -k8s.io/apiserver v0.32.2/go.mod h1:PEwREHiHNU2oFdte7BjzA1ZyjWjuckORLIK/wLV5goM= -k8s.io/client-go v0.32.2 h1:4dYCD4Nz+9RApM2b/3BtVvBHw54QjMFUl1OLcJG5yOA= -k8s.io/client-go v0.32.2/go.mod h1:fpZ4oJXclZ3r2nDOv+Ux3XcJutfrwjKTCHz2H3sww94= -k8s.io/cloud-provider v0.32.2 h1:8EC+fCYo0r0REczSjOZcVuQPCMxXxCKlgxDbYMrzC30= -k8s.io/cloud-provider v0.32.2/go.mod h1:2s8TeAXhVezp5VISaTxM6vW3yDonOZXoN4Aryz1p1PQ= -k8s.io/component-base v0.32.2 h1:1aUL5Vdmu7qNo4ZsE+569PV5zFatM9hl+lb3dEea2zU= -k8s.io/component-base v0.32.2/go.mod h1:PXJ61Vx9Lg+P5mS8TLd7bCIr+eMJRQTyXe8KvkrvJq0= -k8s.io/component-helpers v0.32.2 h1:2usSAm3zNE5yu5DdAdrKBWLfSYNpU4OPjZywJY5ovP8= -k8s.io/component-helpers v0.32.2/go.mod h1:fvQAoiiOP7jUEUBc9qR0PXiBPuB0I56WTxTkkpcI8g8= -k8s.io/controller-manager v0.32.2 h1:/9XuHWEqofO2Aqa4l7KJGckJUcLVRWfx+qnVkdXoStI= -k8s.io/controller-manager v0.32.2/go.mod h1:o5uo2tLCQhuoMt0RfKcQd0eqaNmSKOKiT+0YELCqXOk= +k8s.io/api v0.33.0-alpha.1 h1:/qGWhT9A8nnWRybvmakRoVAOApQj6zjzKijJUuMmdP0= +k8s.io/api v0.33.0-alpha.1/go.mod h1:sz3ZL/lfe9QOb2EkGxJtvR3O7lGXJrotLfCbLvj4B+E= +k8s.io/apimachinery v0.33.0-alpha.1 h1:aEHpstVSeO8hV/j4gHP4/IWrCqyS4Svv+YV93Jg2leg= +k8s.io/apimachinery v0.33.0-alpha.1/go.mod h1:h8DnJz4KNjkQsP8iFir+s3sSBEK3Iy43bfB2gFjSR+A= +k8s.io/apiserver v0.33.0-alpha.1 h1:UIrikXTCK4SU4GlGIH/qG886oN1Y/OE+QeIne+cLG64= +k8s.io/apiserver v0.33.0-alpha.1/go.mod h1:gwJasOieX7bR41bOmJ0rBHq4H6Z3PQGBHn4w/rVJJlY= +k8s.io/client-go v0.33.0-alpha.1 h1:T2tV8e5YWjnRH7i/vpDG+6IF67/q88RbA0WDLwFrhoM= +k8s.io/client-go v0.33.0-alpha.1/go.mod h1:WC2xcjPr8gKDQDpfoERCYRPZjCxdgSkTxn7VQMO80ck= +k8s.io/cloud-provider v0.33.0-alpha.1 h1:74/X+P1ADUFp36nKmzCS3PiIeitZA33Y0INSei2A+98= +k8s.io/cloud-provider v0.33.0-alpha.1/go.mod h1:A9Gqw4+ouQJvev8iOsGHTSiHYIdBgYOw1SDRC/6wfxk= +k8s.io/component-base v0.33.0-alpha.1 h1:7dGaraFoLzIpNUmJf7bFXdcsoXT3WPGa+XBPMKX/dmg= +k8s.io/component-base v0.33.0-alpha.1/go.mod h1:hlJoaXlmp8KXvBdoIEeXy2YuBkD24JdziqrlMFd//8c= +k8s.io/component-helpers v0.33.0-alpha.1 h1:ZNtNx4OD3gvpwrQCiE7T3mOmPZrwFFU59C5OL1dcxD0= +k8s.io/component-helpers v0.33.0-alpha.1/go.mod h1:at9+IDC55hybnS5+v0jVT51tcUHSFnYZspy0yYzk0Ow= +k8s.io/controller-manager v0.33.0-alpha.1 h1:fjhmXiqZxy7FEzwTMJEkTnLt8AmpUOQU5f1RmciFceo= +k8s.io/controller-manager v0.33.0-alpha.1/go.mod h1:P9A+zi8r5z1NXPTugGU2C/xHdLbn9auSPMlfocuQbvw= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= -k8s.io/kms v0.32.2 h1:7Ff23ht7W40gTcDwUC8G5WjX5W/nxD8WxbNhIYYNZCI= -k8s.io/kms v0.32.2/go.mod h1:Bk2evz/Yvk0oVrvm4MvZbgq8BD34Ksxs2SRHn4/UiOM= -k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y= -k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4= +k8s.io/kms v0.33.0-alpha.1 h1:ujZmoWeqT3mXxdsZBbod9l/kwc88t4UIWs5I4pjMJf4= +k8s.io/kms v0.33.0-alpha.1/go.mod h1:t3rsF7PGEUDZD06bNETS9aJYZVFWMIeaaiiPdASCHVg= +k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 h1:hcha5B1kVACrLujCKLbr8XWMxCxzQx42DY8QKYJrDLg= +k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7/go.mod h1:GewRfANuJ70iYzvn+i4lezLDAFzvjxZYK1gn1lWcfas= k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro= k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 h1:CPT0ExVicCzcpeN4baWEV2ko2Z/AsiZgEdwgcfwLgMo= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.1 h1:uOuSLOMBWkJH0TWa9X6l+mj5nZdm6Ay6Bli8HL8rNfk= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.1/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw= sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8= sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo= sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA= diff --git a/ibm/ibm_version.go b/ibm/ibm_version.go index c4be4af75..53a796796 100644 --- a/ibm/ibm_version.go +++ b/ibm/ibm_version.go @@ -31,7 +31,7 @@ var ( ) // Version is overwritten during builds. -var Version = "v1.32.1" +var Version = "v1.33.0-alpha.1" func PrintVersionAndExitIfRequested() { if versionFlag { diff --git a/main.go b/main.go index 52d477edd..0d3f26c79 100644 --- a/main.go +++ b/main.go @@ -18,8 +18,8 @@ *******************************************************************************/ // References: -// - https://raw.githubusercontent.com/kubernetes/kubernetes/v1.32.1/staging/src/k8s.io/cloud-provider/app/controllermanager.go -// - https://raw.githubusercontent.com/kubernetes/kubernetes/v1.32.1/staging/src/k8s.io/cloud-provider/sample/basic_main.go +// - https://raw.githubusercontent.com/kubernetes/kubernetes/v1.33.0-alpha.1/staging/src/k8s.io/cloud-provider/app/controllermanager.go +// - https://raw.githubusercontent.com/kubernetes/kubernetes/v1.33.0-alpha.1/staging/src/k8s.io/cloud-provider/sample/basic_main.go package main diff --git a/pkg/klog/logger.go b/pkg/klog/logger.go deleted file mode 100644 index 16f6f42f1..000000000 --- a/pkg/klog/logger.go +++ /dev/null @@ -1,66 +0,0 @@ -/******************************************************************************* -* IBM Cloud Kubernetes Service, 5737-D43 -* (C) Copyright IBM Corp. 2022 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. -*******************************************************************************/ - -// Package klog provides standard formatting -package klog - -import ( - "fmt" - "time" - - "k8s.io/klog/v2" -) - -// Variable to determine which type of logging should be done -var logStdout = false - -func SetOutputToStdout() { - logStdout = true -} - -// Errorf ... -func Errorf(format string, v ...interface{}) { - if logStdout { - fmt.Printf("ERROR: "+format+"\n", v...) - } else { - s := fmt.Sprintf(format, v...) - klog.ErrorDepth(1, s) - } -} - -// Infof ... -func Infof(format string, v ...interface{}) { - if logStdout { - timestamp := time.Now().Format("15:04:05.0000") - fmt.Printf("INFO: ["+timestamp+"] "+format+"\n", v...) - } else { - s := fmt.Sprintf(format, v...) - klog.InfoDepth(1, s) - } -} - -// Warningf ... -func Warningf(format string, v ...interface{}) { - if logStdout { - fmt.Printf("WARNING: "+format+"\n", v...) - } else { - s := fmt.Sprintf(format, v...) - klog.WarningDepth(1, s) - } -} diff --git a/scripts/publishTag.sh b/scripts/publishTag.sh index fe35c8d03..ca3a14c5a 100755 --- a/scripts/publishTag.sh +++ b/scripts/publishTag.sh @@ -43,7 +43,7 @@ if [[ -n "${EXISTING_TAG}" && "${FORCE_TAG}" != "true" ]]; then fi # Set default tag. -BASE_TAG="v1.32.1" +BASE_TAG="v1.33.0-alpha.1" # Determine the next build tag. BASE_TAGS=$(git tag --list "${BASE_TAG}-[0-9]*" --sort=v:refname) diff --git a/vagrant-kube-build/Vagrantfile b/vagrant-kube-build/Vagrantfile index 212e98d4a..dfbdba459 100644 --- a/vagrant-kube-build/Vagrantfile +++ b/vagrant-kube-build/Vagrantfile @@ -55,9 +55,9 @@ function exit_build { apt-get install -y make if ! hash go 2>/dev/null; then # Add apt-repository ppa:ubuntu-lxc/lxd-stable - curl -O https://dl.google.com/go/go1.23.4.linux-amd64.tar.gz + curl -O https://dl.google.com/go/go1.23.5.linux-amd64.tar.gz if [[ $? -ne 0 ]]; then exit_build ; fi - tar -C /usr/local -xzf go1.23.4.linux-amd64.tar.gz + tar -C /usr/local -xzf go1.23.5.linux-amd64.tar.gz if [[ $? -ne 0 ]]; then exit_build ; fi if [ ! -n "$(grep "/usr/local/go/bin" /etc/profile)" ]; then echo 'export PATH=$PATH:/usr/local/go/bin' >> /etc/profile diff --git a/vagrant-kube-build/provisioning/build_docker_registry.sh b/vagrant-kube-build/provisioning/build_docker_registry.sh index f1939f7fd..2e5e1226f 100755 --- a/vagrant-kube-build/provisioning/build_docker_registry.sh +++ b/vagrant-kube-build/provisioning/build_docker_registry.sh @@ -23,7 +23,7 @@ function exit_build { exit 1 } -BUILD_VERSION="v1.32.1" +BUILD_VERSION="v1.33.0-alpha.1" BUILD_REGISTRY_NAME="armada-master" BUILD_REGISTRY_IP_ADDRESS="192.168.10.10" BUILD_REGISTRY_PORT="5000"