Skip to content

Commit 83f4085

Browse files
manifest and workflow changes
1 parent 149c88a commit 83f4085

File tree

287 files changed

+28647
-30
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

287 files changed

+28647
-30
lines changed

.github/workflows/release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${GITHUB_ACTOR,,} --password-stdin
2727

2828
- name: Build Image
29-
run: OSS_REGISTRY="ghcr.io/oracle" VERSION="${{ github.ref_name }}" make image
29+
run: OSS_REGISTRY="ghcr.io/${GITHUB_ACTOR,,}" VERSION="${{ github.ref_name }}" make image
3030

3131
- name: Push Image
32-
run: OSS_REGISTRY="ghcr.io/oracle" VERSION="${{ github.ref_name }}" make docker-push-all
32+
run: OSS_REGISTRY="ghcr.io/${GITHUB_ACTOR,,}" VERSION="${{ github.ref_name }}" make docker-push-all

hack/existing-standalone-cluster-env-template.sh

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,41 +14,45 @@
1414
##################################################################################################
1515

1616
# The test suites to run (can replace or add tags)
17-
export FOCUS="\[cloudprovider\]"
17+
export FOCUS="\[ccm\]"
18+
19+
#Architecture to run tests on
20+
export ARCHITECTURE_AMD="AMD"
21+
export ARCHITECTURE_ARM="ARM"
1822

1923
# Scope can be ARM / AMD / BOTH
2024
# Mandatory
21-
export SCOPE="BOTH"
25+
export SCOPE="AMD"
2226

2327
# A Reserved IP in your compartment for testing LB creation with Reserved IP
2428
# Create a public reserved IP in your compartment using the following link:
2529
# https://docs.oracle.com/en-us/iaas/Content/Network/Tasks/managingpublicIPs.htm#console-reserved
2630
# Set the public reserved IP in the following env-variable:
2731
# Mandatory
28-
export RESERVED_IP=""
32+
export RESERVED_IP="169.155.149.109"
2933

3034
# Set path to kubeconfig of existing cluster if it does not exist in default path. Defaults to $HOME/.kube/config.
3135
# Mandatory
32-
export CLUSTER_KUBECONFIG=$HOME/.kube/config
36+
export CLUSTER_KUBECONFIG=/Users/ypgohoka/.e2e_ccm_csi/oss-testing-1.kubeconfig
3337

3438
# Set path to cloud_config of existing cluster if it does not exist in default path. Defaults to $HOME/cloudconfig.
3539
# Mandatory
36-
export CLOUD_CONFIG=$HOME/cloudconfig
40+
export CLOUD_CONFIG=/Users/ypgohoka/go/src/github.com/oracle/oci-cloud-controller-manager/hack/provider-config-example.yaml
3741

3842
# ADLOCATION example is IqDk:US-ASHBURN-AD-1
3943
# Mandatory
40-
export ADLOCATION=""
44+
export ADLOCATION="Ddfp:US-ASHBURN-AD-2"
4145

4246
# KMS key for CMEK testing
4347
# CMEK KEY example "ocid1.key.relm.region.bb..cc.aaa...aa"
4448
# Mandatory
45-
export CMEK_KMS_KEY=""
49+
export CMEK_KMS_KEY="ocid1.key.oc1.iad.b5r7iu5xaagy2.abuwcljsizwczmdfnitnxaruykluz3p6kwprasd2l7ebfvbkxbytvuumg4cq"
4650

4751
# NSG Network security group created in cluster's VCN
4852
# CCM E2E tests require two NSGs to run successfully. Please create two NSGs in the cluster's VCN and set NSG_OCIDS
4953
# NSG_OCIDS example ocid1.networksecuritygroup.relm.region.aa...aa,ocid1.networksecuritygroup.relm.region.aa...aa
5054
# Mandatory
51-
export NSG_OCIDS=""
55+
export NSG_OCIDS="ocid1.networksecuritygroup.oc1.iad.aaaaaaaadmbnpdgorxe26epwelmapmxmooiouq5p65jkpeut5tamrovfh2va,ocid1.networksecuritygroup.oc1.iad.aaaaaaaaietpqjjzct2aehnoyvqyc4g5zfcpe52givqgew3bzmubrgcqbuyq"
5256

5357
# FSS VOLUME HANDLE in the format filesystem_ocid:mountTargetIP:export_path
5458
# Make sure fss volume handle is in the same subnet as your nodes
@@ -57,7 +61,7 @@ export NSG_OCIDS=""
5761
# And setup your network for the file system by following:
5862
# https://docs.oracle.com/en-us/iaas/Content/File/Tasks/securitylistsfilestorage.htm
5963
# Mandatory
60-
export FSS_VOLUME_HANDLE=""
64+
export FSS_VOLUME_HANDLE="ocid1.filesystem.oc1.iad.aaaaaaaaaacdndlxnfqwillqojxwiotjmfsc2ylefuyqaaaa:10.0.73.199:/oss-test"
6165

6266
# For debugging the tests in existing cluster, do not turn it off by default.
6367
# Optional
@@ -67,8 +71,6 @@ export FSS_VOLUME_HANDLE=""
6771
# Optional
6872
# export IMAGE_PULL_REPO="accessiblerepo.com/repo/path/"
6973

70-
export MNT_TARGET_ID=""
71-
export MNT_TARGET_SUBNET_ID=""
72-
export MNT_TARGET_COMPARTMENT_ID=""
73-
74-
export STATIC_SNAPSHOT_COMPARTMENT_ID=""
74+
export MNT_TARGET_ID="ocid1.mounttarget.oc1.iad.aaaaacvippzjdfiynfqwillqojxwiotjmfsc2ylefuyqaaaa"
75+
export MNT_TARGET_SUBNET_ID="ocid1.subnet.oc1.iad.aaaaaaaafujcpvwdn3s2liqwrilolm7jmxkwq35zieo7zk4medjtqxjac7cq"
76+
export MNT_TARGET_COMPARTMENT_ID="ocid1.compartment.oc1..aaaaaaaaee2fxlf36idmiqlyvnyhkh2oquz5loogbmzat73hnnqhu2c3352a"

hack/run_e2e_test.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ check-env "FSS_VOLUME_HANDLE" $FSS_VOLUME_HANDLE
2929
check-env "MNT_TARGET_ID" $MNT_TARGET_ID
3030
check-env "MNT_TARGET_SUBNET_ID" $MNT_TARGET_SUBNET_ID
3131
check-env "MNT_TARGET_COMPARTMENT_ID" $MNT_TARGET_COMPARTMENT_ID
32-
check-env "CLUSTER_TYPE" $CLUSTER_TYPE
3332

3433
function set_image_pull_repo_and_delete_namespace_flag () {
3534
if [ -z "$IMAGE_PULL_REPO" ]; then
@@ -56,7 +55,6 @@ function run_e2e_tests_existing_cluster() {
5655
--architecture=${ARCHITECTURE} \
5756
--volume-handle=${FSS_VOLUME_HANDLE} \
5857
--static-snapshot-compartment-id=${STATIC_SNAPSHOT_COMPARTMENT_ID}
59-
--cluster-type=${CLUSTER_TYPE}
6058
retval=$?
6159
return $retval
6260
}
@@ -97,7 +95,6 @@ echo "CLOUD_CONFIG is ${CLOUD_CONFIG}"
9795
echo "MNT_TARGET_ID is ${MNT_TARGET_ID}"
9896
echo "MNT_TARGET_SUBNET_ID is ${MNT_TARGET_SUBNET_ID}"
9997
echo "MNT_TARGET_COMPARTMENT_ID is ${MNT_TARGET_COMPARTMENT_ID}"
100-
echo "CLUSTER_TYPE is ${CLUSTER_TYPE}"
10198

10299
function run_tests () {
103100
set_image_pull_repo_and_delete_namespace_flag

manifests/cloud-controller-manager/oci-cloud-controller-manager-rbac.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ rules:
3434
- list
3535
- watch
3636
- patch
37+
- get
3738

3839
- apiGroups:
3940
- ""
@@ -130,6 +131,9 @@ rules:
130131
- serviceaccounts
131132
verbs:
132133
- create
134+
- list
135+
- get
136+
- watch
133137
- apiGroups:
134138
- ""
135139
resources:

manifests/cloud-controller-manager/oci-cloud-controller-manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ spec:
4242
path: /etc/kubernetes
4343
containers:
4444
- name: oci-cloud-controller-manager
45-
image: ghcr.io/oracle/cloud-provider-oci:latest
45+
image: ghcr.io/yashwantgohokar/cloud-provider-oci:v1.26.1
4646
command: ["/usr/local/bin/oci-cloud-controller-manager"]
4747
args:
4848
- --cloud-config=/etc/oci/cloud-provider.yaml

manifests/container-storage-interface/oci-csi-controller-driver.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ spec:
5252
- mountPath: /var/run/shared-tmpfs
5353
name: shared-tmpfs
5454
- name: csi-attacher
55-
image: k8s.gcr.io/sig-storage/csi-attacher:v4.2.0
55+
image: registry.k8s.io/sig-storage/csi-attacher:v4.2.0
5656
args:
5757
- --csi-address=/var/run/shared-tmpfs/csi.sock
5858
- --timeout=120s
@@ -65,7 +65,7 @@ spec:
6565
- mountPath: /var/run/shared-tmpfs
6666
name: shared-tmpfs
6767
- name: csi-resizer
68-
image: k8s.gcr.io/sig-storage/csi-resizer:v1.7.0
68+
image: registry.k8s.io/sig-storage/csi-resizer:v1.7.0
6969
args:
7070
- --csi-address=/var/run/shared-tmpfs/csi.sock
7171
- --leader-election
@@ -96,7 +96,7 @@ spec:
9696
- --fss-csi-endpoint=unix://var/run/shared-tmpfs/csi-fss.sock
9797
command:
9898
- /usr/local/bin/oci-csi-controller-driver
99-
image: ghcr.io/oracle/cloud-provider-oci:latest
99+
image: ghcr.io/yashwantgohokar/cloud-provider-oci:v1.26.1
100100
imagePullPolicy: IfNotPresent
101101
volumeMounts:
102102
- name: config

manifests/container-storage-interface/oci-csi-node-driver.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ spec:
117117
fieldPath: spec.nodeName
118118
- name: PATH
119119
value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/host/usr/bin:/host/sbin
120-
image: ghcr.io/oracle/cloud-provider-oci:latest
120+
image: ghcr.io/yashwantgohokar/cloud-provider-oci:v1.26.1
121121
securityContext:
122122
privileged: true
123123
volumeMounts:
@@ -151,7 +151,7 @@ spec:
151151
args:
152152
- --csi-address=/csi/csi.sock
153153
- --kubelet-registration-path=/var/lib/kubelet/plugins/blockvolume.csi.oraclecloud.com/csi.sock
154-
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.1
154+
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.1
155155
securityContext:
156156
privileged: true
157157
lifecycle:
@@ -170,7 +170,7 @@ spec:
170170
args:
171171
- --csi-address=/fss/csi.sock
172172
- --kubelet-registration-path=/var/lib/kubelet/plugins/fss.csi.oraclecloud.com/csi.sock
173-
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.0
173+
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.0
174174
securityContext:
175175
privileged: true
176176
lifecycle:

manifests/flexvolume-driver/oci-flexvolume-driver.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ spec:
4040
secretName: oci-flexvolume-driver
4141
containers:
4242
- name: oci-flexvolume-driver
43-
image: ghcr.io/oracle/cloud-provider-oci:latest
43+
image: ghcr.io/yashwantgohokar/cloud-provider-oci:v1.26.1
4444
command: ["/usr/local/bin/install.py", "-c", "/tmp/config.yaml"]
4545
securityContext:
4646
privileged: true
@@ -76,7 +76,7 @@ spec:
7676
type: DirectoryOrCreate
7777
containers:
7878
- name: oci-flexvolume-driver
79-
image: ghcr.io/oracle/cloud-provider-oci:latest
79+
image: ghcr.io/yashwantgohokar/cloud-provider-oci:v1.26.1
8080
command: ["/usr/local/bin/install.py"]
8181
securityContext:
8282
privileged: true

manifests/volume-provisioner/oci-volume-provisioner-fss.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ spec:
3535
secretName: oci-volume-provisioner
3636
containers:
3737
- name: oci-volume-provisioner
38-
image: ghcr.io/oracle/cloud-provider-oci:latest
38+
image: ghcr.io/yashwantgohokar/cloud-provider-oci:v1.26.1
3939
command: ["/usr/local/bin/oci-volume-provisioner"]
4040
env:
4141
- name: NODE_NAME

manifests/volume-provisioner/oci-volume-provisioner.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ spec:
3535
secretName: oci-volume-provisioner
3636
containers:
3737
- name: oci-volume-provisioner
38-
image: ghcr.io/oracle/cloud-provider-oci:latest
38+
image: ghcr.io/yashwantgohokar/cloud-provider-oci:v1.26.1
3939
command: ["/usr/local/bin/oci-volume-provisioner"]
4040
env:
4141
- name: NODE_NAME

vendor/github.com/oracle/oci-go-sdk/v65/core/compute_instance_options.go

Lines changed: 60 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/oracle/oci-go-sdk/v65/core/instance_configuration_instance_source_image_filter_details.go

Lines changed: 57 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/oracle/oci-go-sdk/v65/core/instance_configuration_ipv6_address_ipv6_subnet_cidr_pair_details.go

Lines changed: 48 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)