Merge pull request #438 from YashwantGohokar/oke_oss_release_1.25.2

OKE OSS Release 1.25.2

Dockerfile

@@ -37,4 +37,11 @@ RUN yum install -y util-linux \
   && yum install -y xfsprogs \
   && yum clean all
 
+COPY scripts/encrypt-mount /sbin/encrypt-mount
+COPY scripts/encrypt-umount /sbin/encrypt-umount
+COPY scripts/rpm-host /sbin/rpm-host
+RUN chmod 755 /sbin/encrypt-mount
+RUN chmod 755 /sbin/encrypt-umount
+RUN chmod 755 /sbin/rpm-host
+
 COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/dist/* /usr/local/bin/

Dockerfile_arm_all

@@ -21,4 +21,11 @@ RUN yum install -y util-linux \
   && yum clean all
  \
 
+COPY scripts/encrypt-mount /sbin/encrypt-mount
+COPY scripts/encrypt-umount /sbin/encrypt-umount
+COPY scripts/rpm-host /sbin/rpm-host
+RUN chmod 755 /sbin/encrypt-mount
+RUN chmod 755 /sbin/encrypt-umount
+RUN chmod 755 /sbin/rpm-host
+
 COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/dist/arm/* /usr/local/bin/

README.md

@@ -31,14 +31,15 @@ cloud-provider specific code out of the Kubernetes codebase.
 | v1.22.0   | v1.22                  | -                      |
 | v1.23.0   | v1.23                  | -                      |
 | v1.24.2   | v1.24                  | -                      |
-| v1.25.1   | v1.25                  | -                      |
-| v1.26.0   | v1.26                  | -                      |
+| v1.25.2   | v1.25                  | -                      |
+| v1.26.1   | v1.26                  | -                      |
+| v1.27.0   | v1.27                  | -                      |
 
 
 
 
 Note: 
-Versions older than v1.24.1 are no longer supported, new features / bug fixes will be available in v1.24.1 and later. 
+Versions older than v1.25.2 are no longer supported, new features / bug fixes will be available in v1.25.2 and later. 
 
 ## Implementation
  Currently `oci-cloud-controller-manager` implements:

THIRD_PARTY_LICENSES.txt

@@ -6,13 +6,15 @@ SPDX:Apache-2.0
 ---------------------------------- Copyright -----------------------------------
 Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 Copyright 2014 The Kubernetes Authors.
+Copyright 2016 The Kubernetes Authors.
 Copyright 2017 Oracle and/or its affiliates. All rights reserved.
 Copyright 2017 The Kubernetes Authors.
 Copyright 2018 Oracle and/or its affiliates. All rights reserved.
 Copyright 2019 Oracle and/or its affiliates. All rights reserved.
 Copyright 2020 Oracle and/or its affiliates. All rights reserved.
 Copyright 2021 Oracle and/or its affiliates. All rights reserved.
 Copyright 2022 Oracle and/or its affiliates. All rights reserved.
+Copyright 2023 Oracle and/or its affiliates. All rights reserved.
 
 -------------------------- Fourth Party Dependencies ---------------------------
 
@@ -580,20 +582,6 @@ Copyright 2021 The Kubernetes Authors.
 
 --------------------------------- (separator) ----------------------------------
 
-== Dependency
-github.com/kubernetes-csi/external-resizer
-
-== License Type
-SPDX:Apache-2.0
-
-== Copyright
-Copyright 2018 The Kubernetes Authors.
-Copyright 2019 The Kubernetes Authors.
-Copyright 2020 The Kubernetes Authors.
-Copyright 2022 The Kubernetes Authors.
-
---------------------------------- (separator) ----------------------------------
-
 == Dependency
 github.com/kubernetes-csi/external-snapshotter/client/v6
 
@@ -608,20 +596,6 @@ Copyright 2022 The Kubernetes Authors.
 
 --------------------------------- (separator) ----------------------------------
 
-== Dependency
-github.com/kubernetes-csi/external-snapshotter/v6
-
-== License Type
-SPDX:Apache-2.0
-
-== Copyright
-Copyright 2018 The Kubernetes Authors.
-Copyright 2019 The Kubernetes Authors.
-Copyright 2020 The Kubernetes Authors.
-Copyright 2021 The Kubernetes Authors.
-
---------------------------------- (separator) ----------------------------------
-
 == Dependency
 github.com/magiconair/properties
 
@@ -1750,6 +1724,7 @@ Copyright 2017 The Go Authors. All rights reserved.
 Copyright 2018 The Go Authors. All rights reserved.
 Copyright 2019 The Go Authors. All rights reserved.
 Copyright 2020 The Go Authors. All rights reserved.
+Copyright 2022 The Go Authors. All rights reserved.
 
 == Patents
 Additional IP Rights Grant (Patents)
@@ -2001,6 +1976,7 @@ Copyright 2016 The Go Authors. All rights reserved.
 Copyright 2017 The Go Authors. All rights reserved.
 Copyright 2018 The Go Authors. All rights reserved.
 Copyright 2019 The Go Authors. All rights reserved.
+Copyright 2021 The Go Authors. All rights reserved.
 
 == Patents
 Additional IP Rights Grant (Patents)
@@ -3596,4 +3572,4 @@ the Mozilla Public License, v. 2.0.
 
 === ATTRIBUTION-HELPER-GENERATED:
 === Attribution helper version: {Major:0 Minor:11 GitVersion: GitCommit: GitTreeState:dirty BuildDate:1970-01-01T00:00:00Z GoVersion:go1.19.3 Compiler:gc Platform:darwin/arm64}
-=== License file based on go.mod with md5 sum:  3c73334856a41ee447dc3a4d568b052a
+=== License file based on go.mod with md5 sum:  52aaa5c4cd897ee28d069e2081161b92

container-storage-interface.md

@@ -130,7 +130,7 @@ $ kubectl describe pvc/oci-bv-claim
 
 # Troubleshoot
 
-### FsGroup policy not propagated from pod security context
+## FsGroup policy not propagated from pod security context
 
 If your fsGroup is not being applied on the files in your volume.
 
@@ -183,6 +183,21 @@ spec:
 ```
 `File` - Indicates that the CSI volume driver supports volume ownership and permission change via fsGroup, and Kubernetes may use fsGroup to change permissions and ownership of the volume to match user requested fsGroup in the pod's SecurityPolicy regardless of fstype or access mode.
 
+## Calico-node pods fail readiness health checks when oci-fss-utils is installed on node
+
+If you are using Calico CNI, the following error is thrown by the Calico daemonset pods that are scheduled on the node which has oci-fss-utils package installed:
+```
+Readiness probe failed: 2023-10-12 08:51:08.172 [INFO][346] confd/health.go 180: Number of node(s) with BGP peering established = 0 calico/node is not ready: BIRD is not ready: BGP not established with 10.0.0.5,10.0.76.88,10.0.66.239
+```
+
+### Solution:
+
+Add the following env setting to the calico-node container in the calico-node daemonset manifest.
+```yaml
+- name: IP_AUTODETECTION_METHOD
+  value: 'skip-interface=v-eth.*'
+```
+
 [1]: https://docs.us-phoenix-1.oraclecloud.com/Content/Block/Concepts/overview.htm
 [2]: https://kubernetes.io/blog/2019/01/15/container-storage-interface-ga/
 [3]: https://kubernetes.io/docs/admin/authorization/rbac/

go.mod

@@ -39,20 +39,18 @@ require (
 	github.com/container-storage-interface/spec v1.6.0
 	github.com/golang/protobuf v1.5.2
 	github.com/kubernetes-csi/csi-lib-utils v0.11.0
-	github.com/kubernetes-csi/external-resizer v0.0.0-20220909153723-62048789556f // v1.6.0
 	github.com/kubernetes-csi/external-snapshotter/client/v6 v6.1.0
-	github.com/kubernetes-csi/external-snapshotter/v6 v6.1.0
 	github.com/onsi/ginkgo v1.16.5
-	github.com/onsi/gomega v1.20.1
-	github.com/oracle/oci-go-sdk/v65 v65.40.1
+	github.com/onsi/gomega v1.24.0
+	github.com/oracle/oci-go-sdk/v65 v65.49.2
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.13.0
 	github.com/spf13/cobra v1.4.0 // indirect
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.8.1
 	go.uber.org/zap v1.21.0
-	golang.org/x/net v0.0.0-20220909164309-bea034e7d591
-	golang.org/x/sys v0.6.0 // indirect
+	golang.org/x/net v0.1.0
+	golang.org/x/sys v0.8.0 // indirect
 	google.golang.org/grpc v1.49.0
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0
 	gopkg.in/yaml.v2 v2.4.0
@@ -74,6 +72,7 @@ require (
 )
 
 require (
+	golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
 	google.golang.org/protobuf v1.28.1
 	k8s.io/apiextensions-apiserver v0.25.4
 )
@@ -101,7 +100,7 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/google/gnostic v0.6.9 // indirect
-	github.com/google/go-cmp v0.5.8 // indirect
+	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
@@ -123,6 +122,7 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/nxadm/tail v1.4.8 // indirect
+	github.com/onsi/ginkgo/v2 v2.6.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/selinux v1.10.0 // indirect
 	github.com/pelletier/go-toml v1.9.3 // indirect
@@ -150,14 +150,13 @@ require (
 	go.opentelemetry.io/proto/otlp v0.7.0 // indirect
 	go.uber.org/atomic v1.7.0 // indirect
 	go.uber.org/multierr v1.6.0 // indirect
-	golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
-	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
+	golang.org/x/crypto v0.1.0 // indirect
+	golang.org/x/mod v0.6.0 // indirect
 	golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a // indirect
-	golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
-	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/term v0.1.0 // indirect
+	golang.org/x/text v0.4.0 // indirect
 	golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
-	golang.org/x/tools v0.1.12 // indirect
+	golang.org/x/tools v0.2.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect