diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 600859f..2ff3e18 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -29,7 +29,7 @@ jobs: - name: Download operator sdk shell: bash env: - RELEASE_VERSION: v1.9.0 + RELEASE_VERSION: v1.13.1 run: | curl -LO https://github.com/operator-framework/operator-sdk/releases/download/${RELEASE_VERSION}/operator-sdk_linux_amd64 chmod +x operator-sdk_linux_amd64 diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 1804955..965ce92 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -33,7 +33,7 @@ jobs: - name: Download operator sdk shell: bash env: - RELEASE_VERSION: v1.9.0 + RELEASE_VERSION: v1.13.1 run: | curl -LO https://github.com/operator-framework/operator-sdk/releases/download/${RELEASE_VERSION}/operator-sdk_linux_amd64 chmod +x operator-sdk_linux_amd64 @@ -231,7 +231,7 @@ jobs: - name: Download operator sdk shell: bash env: - RELEASE_VERSION: v1.9.0 + RELEASE_VERSION: v1.13.1 run: | curl -LO https://github.com/operator-framework/operator-sdk/releases/download/${RELEASE_VERSION}/operator-sdk_linux_amd64 chmod +x operator-sdk_linux_amd64 @@ -265,7 +265,7 @@ jobs: sed -i '/replaces: '"$(basename $GITHUB_REPOSITORY)"'/d' ./bundle/manifests/$(basename $GITHUB_REPOSITORY).clusterserviceversion.yaml mkdir -p ./tmp/community-operators-prod/operators/$(basename $GITHUB_REPOSITORY)/${VERSION} /bin/cp -v -R ./bundle/* ./tmp/community-operators-prod/operators/$(basename $GITHUB_REPOSITORY)/${VERSION} - /bin/cp -v -R ./config/community-operators/* ./tmp/community-operators-prod/operators/$(basename $GITHUB_REPOSITORY) + /bin/cp -v -R ./config/community-operators/ci.yaml ./tmp/community-operators-prod/operators/$(basename $GITHUB_REPOSITORY) - name: process bundle for disconnected support uses: redhat-cop/github-actions/disconnected-csv@master diff --git a/config/default/manager_auth_proxy_patch.yaml b/config/default/manager_auth_proxy_patch.yaml index 4ffa045..0d1c243 100644 --- a/config/default/manager_auth_proxy_patch.yaml +++ b/config/default/manager_auth_proxy_patch.yaml @@ -10,7 +10,7 @@ spec: spec: containers: - name: kube-rbac-proxy - image: registry.redhat.io/openshift4/ose-kube-rbac-proxy@sha256:6d57bfd91fac9b68eb72d27226bc297472ceb136c996628b845ecc54a48b31cb + image: quay.io/redhat-cop/kube-rbac-proxy:v0.11.0 args: - "--secure-listen-address=0.0.0.0:8443" - "--upstream=http://127.0.0.1:8080/" diff --git a/config/helmchart/templates/service-account.yaml b/config/helmchart/templates/service-account.yaml new file mode 100644 index 0000000..55f7d32 --- /dev/null +++ b/config/helmchart/templates/service-account.yaml @@ -0,0 +1,4 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + name: global-load-balancer-operator-controller-manager \ No newline at end of file diff --git a/config/helmchart/values.yaml.tpl b/config/helmchart/values.yaml.tpl index 08877dc..4970f67 100644 --- a/config/helmchart/values.yaml.tpl +++ b/config/helmchart/values.yaml.tpl @@ -29,9 +29,9 @@ affinity: {} kube_rbac_proxy: image: - repository: gcr.io/kubebuilder/kube-rbac-proxy + repository: quay.io/redhat-cop/kube-rbac-proxy pullPolicy: IfNotPresent - tag: v0.8.0 + tag: v0.11.0 resources: requests: cpu: 100m diff --git a/config/rbac/kustomization.yaml b/config/rbac/kustomization.yaml index 27cb1d1..66c2833 100644 --- a/config/rbac/kustomization.yaml +++ b/config/rbac/kustomization.yaml @@ -1,5 +1,4 @@ resources: -- service_account.yaml - role.yaml - role_binding.yaml - leader_election_role.yaml diff --git a/config/rbac/service_account.yaml b/config/rbac/service_account.yaml deleted file mode 100644 index 0033602..0000000 --- a/config/rbac/service_account.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: v1 -kind: ServiceAccount -metadata: - name: controller-manager - namespace: system \ No newline at end of file